Fix fce merge conflict

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index d1ed03f2f8190fc9f382c6bcee1d477ab692a527..757b22a7d716020af4fa142e7d07d8bfe3c17317 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,15 @@
-Changes in XXX
-=================
+Changes in 2.2beta4
+===================
 
+* NEW: afpd: new afpd.conf options "tcprcvbuf" and "tcpsndbuf" to customize
+       the corresponding TCP socket options.
+* NEW: afpd: new afpd.conf option "nozeroconf" which disabled automatic
+       Zeroconf service registration.
 * FIX: afpd: generate mersenne primes for DHX2 UAM once at startup,
        not for every login
+* FIX: afpd: DSI streaming deadlock
+* FIX: afpd: extended sleep
+* FIX: afpd: directory cache
 * FIX: Support for platforms that do not have the *at functions
 * UPD: afpd: put POSIX write lock on volume files while reading them
 
@@ -95,6 +102,7 @@ Changes in 2.1.6
 * FIX: Solaris: configure script failed to enable DDP module
 * FIX: AppleDouble buffer overrun by extremely long filename
 * UPD: afpd: return version info with machine type in DSIGetStatus
+* UPD: dbd: use on-disk temporary rebuild db instead of in-memory db
 
 Changes in 2.1.5
 ================