X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=CHANGES;h=8ca22c8558c3484ce6b9c1fce32d9a73a458f252;hp=3534ab9b982f23312685f38f4b178324771323d3;hb=43e9b0f67cb87f430b71a646f1283764d94fdd09;hpb=01490ecd70cfad4f7d6719a326c2a3fed71bd4eb

diff --git a/CHANGES b/CHANGES
index 3534ab9..8ca22c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -125,6 +125,11 @@ Voicemail Changes
   * Added support for storage of greetings using an IMAP server
   * Added ability to customize forward, reverse, stop, and pause keys for message playback
   * SMDI is now enabled in voicemail using the smdienable option.
+  * A "lockmode" option has been added to asterisk.conf to configure the file
+     locking method used for voicemail, and potentially other things in the
+	 future.  The default is the old behavior, lockfile.  However, there is a
+	 new method, "flock", that uses a different method for situations where the
+	 lockfile will not work, such as on SMB/CIFS mounts.
 
 Queue changes
 -------------