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 b62013954f OAK-9447: cleanup formatting changes
add 20c5f8cfed OAK-9447: Fix build and removed unwanted changes due to
conflicts.
No new revisions were added by this update.
Summary of changes:
.../indexer/document/DocumentStoreIndexerBase.java | 2 --
.../document/flatfile/FlatFileNodeStoreBuilder.java | 8 ++------
.../oak/run/cli/DocumentFixtureProvider.java | 1 -
.../jackrabbit/oak/run/DataStoreCheckCommand.java | 5 -----
.../java/org/apache/jackrabbit/oak/run/Utils.java | 3 ---
.../plugins/document/DocumentNodeStoreService.java | 2 +-
.../plugins/document/mongo/MongoDocumentStore.java | 8 +-------
.../plugins/document/mongo/MongoVersionGCSupport.java | 13 ++-----------
.../document/mongo/ReplicaSetResilienceIT.java | 19 ++++++-------------
9 files changed, 12 insertions(+), 49 deletions(-)