This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 189b9ad0a7 OAK-11720 : added OSGI config to avoid taking exclusive
merge lock in case of conflicts
add 5442748c93 OAK-11709 Merging index definitions: merge 'tags' and
override 'type' (#2283)
No new revisions were added by this update.
Summary of changes:
.../oak/index/merge/IndexDefMergerUtils.java | 80 +++++++++++++++++++++-
.../index/merge/IndexDefMergerScenariosTest.java | 1 +
.../oak/index/merge/IndexDefMergerTest.java | 54 +++++++++++++++
.../oak/index/merge/merge-override-tags-type.json | 54 +++++++++++++++
4 files changed, 187 insertions(+), 2 deletions(-)
create mode 100644
oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merge-override-tags-type.json
