This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from c48adeaa23 Merge branch '2.1' into 3.1
add b3424a86b9 Made lock acquisition consistent (#5224)
new 81c7f3db48 Merge branch '2.1' into 3.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/core/lock/ServiceLockSupport.java | 152 +++++++++++++++++++++
.../coordinator/CompactionCoordinator.java | 5 +-
.../coordinator/CoordinatorLockWatcher.java | 94 -------------
.../org/apache/accumulo/compactor/Compactor.java | 19 +--
.../apache/accumulo/gc/SimpleGarbageCollector.java | 41 +++---
.../java/org/apache/accumulo/manager/Manager.java | 69 +---------
.../java/org/apache/accumulo/monitor/Monitor.java | 60 +-------
.../org/apache/accumulo/tserver/ScanServer.java | 23 +---
.../org/apache/accumulo/tserver/TabletServer.java | 23 +---
9 files changed, 192 insertions(+), 294 deletions(-)
create mode 100644
core/src/main/java/org/apache/accumulo/core/lock/ServiceLockSupport.java
delete mode 100644
server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CoordinatorLockWatcher.java
