Merge commit 'mlcastle/master'

[monkeysphere.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d326473910d4de683eb02830f31e4cf9732e94a8..2133d2d6018404e38e61a918d9ce602b5d37ec25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
 monkeysphere (0.2-1) UNRELEASED; urgency=low
 
-  * NOT YET RELEASED
-  * 
+  [ Daniel Kahn Gillmor ]
+  * NOT YET RELEASED (switch to "experimental" when ready to release)
 
- -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Thu, 19 Jun 2008 04:03:45 -0400
+  [ Jameson Graef Rollins ]
+  * Add AUTHORIZED_USER_IDS config variable for server, which defaults to
+    %h/.config/monkeysphere/authorized_user_ids, instead of
+    /etc/monkeysphere/authorized_user_ids.
+  * Remove {update,remove}-userids functions, since we decided they
+    weren't useful enough to be worth maintaining.
+  * Better handling of unknown users in server update-users
+  * Add file locking when modifying known_hosts or authorized_keys
 
-monkeysphere (0.1-1) unstable; urgency=low
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Fri, 20 Jun 2008 00:43:44 -0400
+
+monkeysphere (0.1-1) experimental; urgency=low
 
   * First release of debian package for monkeysphere.
   * This is experimental -- please report bugs!