This is an automated email from the ASF dual-hosted git repository.
joscorbe pushed a change to branch OAK-11720
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 679bca5cfe OAK-11720 : added OSGI config to avoid taking exclusive
merge lock in case of conflicts
add 0941f2bc8e OAK-11720: Avoid further retries and change config name to
avoidExclusiveMergeLock
No new revisions were added by this update.
Summary of changes:
.../apache/jackrabbit/oak/plugins/document/Configuration.java | 8 ++++----
.../oak/plugins/document/DocumentNodeStoreBranch.java | 10 +++++++---
.../oak/plugins/document/DocumentNodeStoreService.java | 4 ++--
.../document/DocumentNodeStoreServiceConfigurationTest.java | 8 ++++----
4 files changed, 17 insertions(+), 13 deletions(-)
