This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from df8a3670a4 Merge branch '3.1' add 1aa9a1b370 Modified InstanceOperations.getActiveCompactions for Compactors (#4845) add a49009c608 Merge branch '2.1' into 3.1 new 996f94ec0b Merge branch '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/ClientTabletCache.java | 6 +- .../core/clientImpl/InstanceOperationsImpl.java | 46 ++++++++---- .../core/clientImpl/TabletServerBatchWriter.java | 6 +- .../core/clientImpl/ZookeeperLockChecker.java | 5 ++ .../shell/commands/ListCompactionsCommand.java | 3 +- .../accumulo/test/functional/CompactionIT.java | 84 ++++++++++++++++++++++ 8 files changed, 151 insertions(+), 27 deletions(-)