This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 5cbef68a05 Another attempt at fixing MemoryStarvedScanIT (#5319)
new 18cdc28690 Fix trivial typos and warnings
new 187733f634 Merge branch '2.1' into 3.1
The 2 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:
.../core/client/admin/compaction/CompactionSelector.java | 2 +-
.../src/main/java/org/apache/accumulo/core/data/LoadPlan.java | 2 ++
.../org/apache/accumulo/core/fate/zookeeper/ZooCache.java | 11 +----------
.../org/apache/accumulo/server/util/ServiceStatusCmd.java | 1 -
.../apache/accumulo/server/util/checkCommand/CheckRunner.java | 3 ++-
.../apache/accumulo/test/functional/GracefulShutdownIT.java | 2 ++
.../apache/accumulo/test/functional/MemoryStarvedScanIT.java | 3 ++-
7 files changed, 10 insertions(+), 14 deletions(-)
