You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/06/11 16:20:42 UTC

svn commit: r1684897 - /jackrabbit/oak/branches/1.0/RELEASE-NOTES.txt

Author: mreutegg
Date: Thu Jun 11 14:20:42 2015
New Revision: 1684897

URL: http://svn.apache.org/r1684897
Log:
OAK-2762: Configurable maxLockTryTimeMS

Modified:
    jackrabbit/oak/branches/1.0/RELEASE-NOTES.txt

Modified: jackrabbit/oak/branches/1.0/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/RELEASE-NOTES.txt?rev=1684897&r1=1684896&r2=1684897&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/RELEASE-NOTES.txt (original)
+++ jackrabbit/oak/branches/1.0/RELEASE-NOTES.txt Thu Jun 11 14:20:42 2015
@@ -15,6 +15,14 @@ stable and targeted for production use.
 The Oak effort is a part of the Apache Jackrabbit project.
 Apache Jackrabbit is a project of the Apache Software Foundation.
 
+New configuration options in Oak 1.0.15
+---------------------------------------
+
+The DocumentNodeStore has a new system property, which controls the time a
+commit tries to acquire the merge lock: -Doak.maxLockTryTimeMultiplier=30
+The default value is 30 and roughly translates to 60 seconds. See OAK-2762
+and OAK-2823 for more details.
+
 Changes in Oak 1.0.15
 ---------------------