This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 518f6b3e88af85436021e1191f5e41f1dc52d32c Merge: 6ce0d67 662f8a9 Author: Michael Blow <[email protected]> AuthorDate: Thu Mar 17 10:00:02 2022 -0400 Merge branch 'gerrit/neo' Change-Id: Iaf06e2c6567837b88205c0faefdca8eb6f4d6d5b .../org/apache/asterix/app/nc/RecoveryManager.java | 2 +- .../org/apache/asterix/app/nc/ReplicaManager.java | 4 +-- .../common/api/IDatasetLifecycleManager.java | 19 +++++++----- .../common/context/DatasetLifecycleManager.java | 36 ++++++++++++---------- .../replication/messaging/DeleteFileTask.java | 7 +++++ .../replication/sync/ReplicaSynchronizer.java | 3 +- .../PersistentLocalResourceRepository.java | 4 +++ .../am/lsm/common/impls/AbstractIoOperation.java | 4 +-- 8 files changed, 49 insertions(+), 30 deletions(-)
