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 1d365a9089 Add UTF-8 charsets to String/Byte conversions in main (#4847) add 1aa9a1b370 Modified InstanceOperations.getActiveCompactions for Compactors (#4845) new a49009c608 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: .../core/client/admin/InstanceOperations.java | 19 +++-- .../accumulo/core/clientImpl/ClientContext.java | 9 +++ .../core/clientImpl/InstanceOperationsImpl.java | 46 ++++++++--- .../accumulo/core/clientImpl/TabletLocator.java | 6 +- .../core/clientImpl/TabletServerBatchWriter.java | 6 +- .../core/clientImpl/ZookeeperLockChecker.java | 5 ++ .../shell/commands/ListCompactionsCommand.java | 3 +- .../test/compaction/ExternalCompaction_1_IT.java | 91 ++++++++++++++++++++++ .../accumulo/test/functional/CompactionIT.java | 81 +++++++++++++++++++ 9 files changed, 239 insertions(+), 27 deletions(-)