X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Fchangelog;h=d3aa26ba2a0b911c31a71bc19ced3daa8175f1af;hb=9868a2b741c1b82156f3d75c8dbc74ed8f5521f1;hp=07e3cbf27965e93f8255b7ad300974bd8f088e82;hpb=9cf20ca6242f82b48ca3d201fab98ba1aabbfe49;p=mirror%2Fuserdir-ldap.git

diff --git a/debian/changelog b/debian/changelog
index 07e3cbf..d3aa26b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,16 +18,24 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
     has historically been used as the root of the user tree.
   * Allow a set of users to be ignored for picking UIDs.
   * When picking uid/gid numbers try to pick the same number for both.
+  * Merge from torproject.org:
+    - Allow sshRSAAuthKey for role accounts.
+    - Support ssh key attributes for gitolite export.
+    - Add ssh-gitolite support.
+  * debianGroups may have cn attribute (helpful when putting samba stuff into
+    ldap).
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
   * ud-fingerserv: update Net::LDAP import
+  * Implement audit logging for ldap
+  * stop running ud-generate if nothing has changed, based on audit logs
 
   [ Martin Zobel-Helas ]
   * ud-generate: generate webPasswords
   * ud-replicate: set correct permissions for web-passwords
 
- -- Martin Zobel-Helas <zobel@debian.org>  Fri, 09 Mar 2012 10:32:44 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 10 Mar 2012 15:21:12 +0100
 
 userdir-ldap (0.3.79) unstable; urgency=low