X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/07a1796d3bf52bca9a325cf517f742ff44b49921..82ac63d798cc7f45a42e14bc2ad05a9388e25a04:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 10f5ef33f..87cf87087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (2.2) UNRELEASED; urgency=low
+
+  * Change the aggregate plugin's locking strategy. Now it defers loading state
+    until the wiki is building and already locked, unless it's aggregating.
+    When aggregating, it does not wait for the lock if it cannot get it, and
+    instead exits, to prevent aggregating processes from piling up.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 20 May 2007 22:23:09 -0400
+
 ikiwiki (2.1) unstable; urgency=low
 
   [ Joey Hess ]