[Logcheck-commits] Hanspeter Kunz: d/changelog: repaired after an erroneous merge

[Gerfried Fuchs]

Module: logcheck
Branch: lenny-backports
Commit: eda263c9b01cd7b1473ed661c91f1c146647818f
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=eda263c9b01cd7b1473ed661c91f1c146647818f

Author: Hanspeter Kunz <hp at edelkunz.ch>
Date:   Thu Jul 29 16:35:45 2010 +0200

d/changelog: repaired after an erroneous merge

---

 debian/changelog |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19dcce4..2ef9ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+logcheck (1.3.12) UNRELEASED; urgency=low
+
+  [ Hanspeter Kunz ]
+  * ignore.d.server/dhcp:
+    - ignore reading global configuration from an LDAP directory
+    - allow dots in the DN (parsing of the DHCP configuration from LDAP dir)
+    - ignore reading subnet configuration from an LDAP directory
+    - ignore reading pool configuration from an LDAP directory
+
+ -- Hanspeter Kunz <hkunz at leto.ifi.uzh.ch>  Thu, 29 Jul 2010 16:37:49 +0200
+
 logcheck (1.3.11) unstable; urgency=low
 
   [ Hannes von Haugwitz ]
@@ -53,9 +64,6 @@ logcheck (1.3.11) unstable; urgency=low
     - ignore messages on establishing a (TLS) connection to the LDAP server
     - ignore successful logins to the LDAP server
     - ignore successful parsing of the DHCP configuration from an LDAP directory
-    - ignore reading global configuration from an LDAP directory
-    - ignore reading subnet configuration from an LDAP directory
-    - ignore reading pool configuration from an LDAP directory
   * ignore.d.server/postfix:
     - ignore another TLS library problem
       (SSL23_GET_CLIENT_HELLO:http request:s23_srvr.c:379)