From: Frank Lahm <franklahm@googlemail.com>
Date: Thu, 16 Jun 2011 12:31:42 +0000 (+0200)
Subject: Merge sf
X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=commitdiff_plain;h=f1c0e462cdfe8d19a14bb4e296ed005e3f14bd56

Merge sf
---

f1c0e462cdfe8d19a14bb4e296ed005e3f14bd56
diff --cc NEWS
index 20d4da9d,60acfbcd..e096cad8
--- a/NEWS
+++ b/NEWS
@@@ -1,30 -1,6 +1,31 @@@
 +Changes in 2.2.1
 +================
 +
 +* FIX: cnid_dbd: increase BerkeleyDB locks and lockobjs
 +* FIX: afpd: increase BerkeleyDB locks and lockobjs
++* FIX: suse: initscript return better status
 +
 +Changes in 2.2
 +==============
 +
 +* NEW: afpd: new volume option "nonetids"
 +* NEW: afpd: ACL access check caching
  * NEW: afpd: FCE event notifications
  * NEW: afpd: new option "-mimicmodel" for specifying Bonjour model registration
 -* FIX: suse: initscript return better status
 +* UPD: Support for Berkeley DB 5.1
 +* UPD: case-conversion is based on Unicode 6.0.0
 +* UPD: cnid_metad: allow up to 4096 volumes
 +* UPD: afpd: only forward SIGTERM and SIGUSR1 from parent to childs
 +* UPD: afpd: use internal function instead of popening du -sh in order to
 +       calculate the used size of a volume for option "volsizelimit"
 +* UPD: afpd: Add negative UUID caching, enhance local UUID handling
 +* FIX: afpd: configuration reload with SIGHUP
 +* FIX: afpd: crashes in the dircache
 +* FIX: afpd: Correct afp logout vs dsi eof behaviour
 +* FIX: afpd: new catsearch was broken
 +* FIX: afpd: only use volume UUIDs in master afpd
 +* FIX: dbd: Multiple fixes, reliable locking
 +* FIX: ad file suite: fix an error that resulted in CNID database inconsistencies
  
  Changes in 2.2beta4
  ===================