This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c2c8cfc23c2afeeb80571f8918896aa17dbcf240
Merge: 0e8dc7ab84 b652f1ee9e
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Wed Nov 15 20:31:35 2023 +0000
Merge remote-tracking branch 'upstream/2.1'
core/pom.xml | 4 ++
.../org/apache/accumulo/core/conf/Property.java | 4 +-
.../apache/accumulo/core/conf/PropertyType.java | 50 ++++++++++++++-
.../accumulo/core/metadata/schema/Ample.java | 2 +-
.../core/metadata/schema/TabletsMetadata.java | 13 ++++
.../apache/accumulo/core/conf/PropertyTest.java | 32 ++++++++++
.../accumulo/core/conf/PropertyTypeTest.java | 11 +++-
.../test/functional/GarbageCollectorIT.java | 4 +-
.../apache/accumulo/test/shell/ConfigSetIT.java | 72 ++++++++++++++++++++++
.../org/apache/accumulo/test/shell/ShellIT.java | 2 +-
10 files changed, 184 insertions(+), 10 deletions(-)
