This is an automated email from the ASF dual-hosted git repository. thomasm pushed a commit to branch OAK-9625 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 306bd096e76ab32f3d89d5abb3df34658447b560 Merge: 708c3d7 44b79ab Author: thomasm <[email protected]> AuthorDate: Fri Nov 26 17:24:19 2021 +0100 Merge branch 'trunk' into OAK-9625 .../oak/api/jmx/QueryEngineSettingsMBean.java | 18 ++++++++++++ .../jackrabbit/oak/api/jmx/package-info.java | 2 +- .../main/java/org/apache/jackrabbit/oak/Oak.java | 8 +++++ .../jackrabbit/oak/plugins/index/Cursors.java | 4 ++- .../jackrabbit/oak/plugins/index/IndexUtils.java | 34 ++++++++++++++++++++++ .../plugins/index/property/PropertyIndexPlan.java | 8 +++-- .../strategy/ContentMirrorStoreStrategy.java | 5 +++- .../jackrabbit/oak/query/QueryEngineSettings.java | 14 +++++++++ .../oak/query/QueryEngineSettingsService.java | 10 +++++++ .../oak/plugins/index/IndexUtilsTest.java | 16 ++++++++++ .../property/PropertyIndexDeprecatedTest.java | 2 +- .../jackrabbit/oak/spi/query/QueryLimits.java | 11 ++++++- .../index/elastic/ElasticIndexProviderService.java | 7 +++-- .../elastic/ElasticIndexProviderServiceTest.java | 18 ++++++++++++ 14 files changed, 146 insertions(+), 11 deletions(-)
