Merge from branch-2-1

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index 00674250acfa2f16ab36f228404bcea34cd2b0f4..0bf870b951bf4625b12f3a47bc08b59b78f262c3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,10 +7,17 @@ Changes in 2.2
 * NEW: afpd: automagic Zeroconf registration with avahi, registering both
        the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
 
+Changes in 2.1.4
+================
+
+* FIX: afpd: Downstream fix for FreeBSD PR 148022
+
 Changes in 2.1.3
 ================
 
 * FIX: afpd: fix a serious error in networking IO code
+* FIX: afpd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO, use
+       non-blocking IO and select instead for writing/sending data.
 * UPD: Support for BerkeleyDB 5.0.
 
 Changes in 2.1.2