X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf35ee04cddd7b9b39636499dd24b689443c0e97..82ac63d798cc7f45a42e14bc2ad05a9388e25a04:/debian/changelog?ds=inline

diff --git a/debian/changelog b/debian/changelog
index aa8effe0e..87cf87087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-ikiwiki (2.1) UNRELEASED; urgency=low
+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 ]
   * Use div layout for the signin and preferences forms, so that they can be
@@ -39,8 +48,10 @@ ikiwiki (2.1) UNRELEASED; urgency=low
   * Add a destpage parameter to the filter hook.
   * Fix links to smilies generated by the smiley plugin for inlined pages. The
     old links were often wrong, but often still worked by accident.
+  * Add a test ensuring that the basewiki is self-contained and has no broken
+    links.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 17 May 2007 15:14:42 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 19 May 2007 20:37:38 -0400
 
 ikiwiki (2.00) unstable; urgency=low