This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ebf7054d1f6bf62d5170dcbbb07c7b0ee572cf2c Merge: c976af383f 18b745466e Author: Dave Marion <dlmar...@apache.org> AuthorDate: Mon Mar 4 12:34:51 2024 +0000 Merge branch '2.1' assemble/bin/accumulo-cluster | 10 +++++++++- .../accumulo/core/conf/cluster/ClusterConfigParser.java | 5 ++++- .../accumulo/core/conf/cluster/ClusterConfigParserTest.java | 11 ++++++++--- .../core/conf/cluster/cluster-with-optional-services.yaml | 3 ++- 4 files changed, 23 insertions(+), 6 deletions(-)