This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from a392a8e650 Upgrade Hadoop dependency to 3.5.0 (#6296)
add b874c0ed66 Adds --dry-run option to Merge (#6437)
new 1852dbfe9c 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/core/util/Merge.java | 59 +++++------
.../org/apache/accumulo/core/util/MergeTest.java | 24 ++---
.../accumulo/shell/commands/MergeCommand.java | 67 ++++++++----
.../accumulo/shell/commands/MergeCommandTest.java | 113 +++++++++++++++++++++
.../test/functional/MergeTabletsITBase.java | 67 +++++++++++-
5 files changed, 265 insertions(+), 65 deletions(-)
