This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a658fa8cbace3381d10555eac51c9f1fbe28b531
Merge: e6026cbdc8 ded409fc46
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Aug 17 19:27:39 2023 -0400
Merge branch '2.1'
minicluster/minicluster.properties | 31 ----------
pom.xml | 8 +--
.../accumulo/shell/format/DeleterFormatter.java | 56 +++++++-----------
.../shell/format/DeleterFormatterTest.java | 69 +++++++++++++++-------
.../build/create-release-candidate.sh | 10 ++--
5 files changed, 81 insertions(+), 93 deletions(-)
diff --cc pom.xml
index a2eecf76d7,033dc81abc..16a6426583
--- a/pom.xml
+++ b/pom.xml
@@@ -1163,7 -1174,7 +1163,7 @@@
</checkstyleRules>
<violationSeverity>warning</violationSeverity>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>**/thrift/*.java,**/HelpMojo.java</excludes>
- <excludes>**/thrift/*.java,**/proto/*.java</excludes>
++ <excludes>**/thrift/*.java</excludes>
</configuration>
<dependencies>
<dependency>
