This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 60f46e1abd minor QA fixes (#3894)
add a2ce072e5c Make sure tablets with WALs are not merged (#3900)
new 4641c55e93 Merge branch '2.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:
.../java/org/apache/accumulo/manager/Manager.java | 6 ++
.../accumulo/manager/TabletGroupWatcher.java | 27 +++++++-
.../apache/accumulo/manager/state/MergeStats.java | 23 +++++++
.../accumulo/manager/state/MergeStatsTest.java | 71 ++++++++++++++++++++++
.../apache/accumulo/test/manager/MergeStateIT.java | 19 ++++++
5 files changed, 145 insertions(+), 1 deletion(-)
create mode 100644
server/manager/src/test/java/org/apache/accumulo/manager/state/MergeStatsTest.java
