This is an automated email from the ASF dual-hosted git repository.
joscorbe pushed a change to branch OAK-9447-joscorbe
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 20c5f8cfed OAK-9447: Fix build and removed unwanted changes due to
conflicts.
add 3d24430dcf OAK-9447: Removed some warnings and reverted some unwanted
changes
No new revisions were added by this update.
Summary of changes:
.../indexer/document/DocumentStoreIndexerBase.java | 4 ----
.../document/flatfile/FlatFileNodeStoreBuilder.java | 8 +-------
.../jackrabbit/oak/run/DataStoreCheckCommand.java | 3 ++-
.../jackrabbit/oak/run/UnlockUpgradeCommand.java | 2 +-
.../java/org/apache/jackrabbit/oak/run/Utils.java | 6 +++---
.../oak/plugins/document/Configuration.java | 5 ++++-
.../plugins/document/DocumentNodeStoreService.java | 12 ++++++++----
.../plugins/document/mongo/MongoDBConnection.java | 20 ++++++++++----------
.../mongo/MongoDocumentNodeStoreBuilderBase.java | 5 ++++-
.../plugins/document/mongo/MongoDocumentStore.java | 1 -
.../plugins/document/mongo/MongoSessionFactory.java | 11 ++++++++---
.../oak/plugins/document/util/MongoConnection.java | 9 +++------
.../document/DocumentNodeStoreServiceTest.java | 1 -
13 files changed, 44 insertions(+), 43 deletions(-)