Merge commit 'dkg/master'

[monkeysphere.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 726f262430836424a1e8793e51e031cdba13aaf2..cec09884fb66f38095669a985565477d751b116e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ monkeysphere (0.2-1) UNRELEASED; urgency=low
     /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
+  * Better failure/prompting for gen-subkey
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Thu, 19 Jun 2008 16:56:32 -0400
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Sat, 21 Jun 2008 16:39:26 -0400
 
 monkeysphere (0.1-1) experimental; urgency=low