Merge branch 'sharemodes-bug560' into branch-netatalk-3-1

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index 9996fec0d02531640c6fafbfe09c48ffd33454c0..b38b278cfc07c798659f6af45ac7199c321c0f8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes in 3.1.2
 * FIX: Spotlight: file modification date, bug #545
 * FIX: Improve reliability of afpd child handler
 * FIX: debian initscript: add 0 and 6 to Default-Stop. debian-bug#745520
+* FIX: put the Solaris share reservation after our locking stuff, bug #560.
 
 Changes in 3.1.1
 ================