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 2b0db6f3e5 Merge branch '2.1' add ce7650f582 Fixed MergeCommand to use Option instead of String (#5456) new 60dce427db 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: .../src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)