This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch single-node-props in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 69cb4a2e5f49f759b259b10b3438f924ecfe15bd Merge: 34da29703f 4d5ec236ea Author: Christopher Tubbs <ctubb...@apache.org> AuthorDate: Tue May 10 16:31:32 2022 -0400 Merge branch 'main' into single-node-props .github/workflows/scripts.yaml | 58 ++++++ assemble/bin/accumulo | 21 ++- assemble/bin/accumulo-cluster | 53 +++--- assemble/bin/accumulo-service | 51 ++--- assemble/bin/accumulo-util | 72 +++---- assemble/build.sh | 209 +++++++++++++-------- assemble/conf/accumulo-env.sh | 29 ++- assemble/src/main/scripts/create-jshell.sh | 19 +- contrib/ci/find-unapproved-chars.sh | 4 +- contrib/ci/find-unapproved-junit.sh | 5 +- .../ci/install-shfmt.sh | 12 +- contrib/ci/it-matrix.sh | 3 +- .../ci/run-shellcheck.sh | 10 +- .../generate-thrift.sh => contrib/ci/run-shfmt.sh | 9 +- core/src/main/scripts/generate-thrift.sh | 50 ++--- .../accumulo/server/metadata/RootGcCandidates.java | 2 +- server/base/src/main/scripts/generate-protobuf.sh | 17 +- .../main/java/org/apache/accumulo/gc/GCRun.java | 3 +- .../accumulo/gc/GarbageCollectionAlgorithm.java | 14 +- .../accumulo/gc/GarbageCollectionEnvironment.java | 5 +- .../apache/accumulo/gc/GarbageCollectionTest.java | 2 +- start/src/test/shell/makeHelloWorldJars.sh | 18 +- start/src/test/shell/makeTestJars.sh | 19 +- test/src/main/scripts/generate-thrift.sh | 2 +- test/src/test/scripts/run-test.sh | 21 +-- 25 files changed, 417 insertions(+), 291 deletions(-)