This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 660ee69f1c90f9665e9a25bd06b1dac1a7abce99 Merge: f05b78ee79 b3ec422ba7 Author: Keith Turner <ktur...@apache.org> AuthorDate: Thu Oct 17 21:02:59 2024 +0000 Merge branch '2.1' into 3.1 .../java/org/apache/accumulo/server/conf/store/PropStoreKey.java | 2 +- .../java/org/apache/accumulo/server/conf/util/PropSnapshot.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)