This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 8a9c10724c Moved paused compaction counter check in MemoryStarvedMinCIT (#5320) new 18cdc28690 Fix trivial typos and warnings new 187733f634 Merge branch '2.1' into 3.1 new 40c5f8edbf Merge branch '3.1' The 3 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: .../apache/accumulo/core/clientImpl/TableOperationsImpl.java | 1 - .../src/main/java/org/apache/accumulo/core/data/LoadPlan.java | 2 ++ .../java/org/apache/accumulo/core/fate/user/FateMutator.java | 11 ++++++----- .../org/apache/accumulo/core/fate/user/UserFateStore.java | 5 +++-- .../java/org/apache/accumulo/core/metadata/schema/Ample.java | 9 +++++---- .../accumulo/core/util/compaction/CompactionPlanImpl.java | 5 +---- .../java/org/apache/accumulo/core/zookeeper/ZooCache.java | 11 +---------- .../core/spi/compaction/RatioBasedCompactionPlannerTest.java | 4 ++-- .../accumulo/server/compaction/CompactionJobGenerator.java | 2 +- .../org/apache/accumulo/server/util/ServiceStatusCmd.java | 1 - .../apache/accumulo/server/util/checkCommand/CheckRunner.java | 3 ++- .../apache/accumulo/test/functional/GracefulShutdownIT.java | 1 + .../apache/accumulo/test/functional/MemoryStarvedScanIT.java | 3 ++- 13 files changed, 26 insertions(+), 32 deletions(-)