This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit da6769eb9cc0dffb422e5f2a89f926dcc7f90910
Merge: 77078f321f 2b5e3ebe65
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Tue May 20 18:07:20 2025 +0000
Merge branch '2.1'
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 18a4d2e026,6b08c7bdf1..cacdff1d3d
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -1541,7 -1932,8 +1541,8 @@@ public enum Property
COMPACTOR_MINTHREADS_TIMEOUT,
// others
- TSERV_NATIVEMAP_ENABLED, TSERV_SCAN_MAX_OPENFILES,
MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME);
+ TSERV_NATIVEMAP_ENABLED, TSERV_MAXMEM, TSERV_SCAN_MAX_OPENFILES,
- MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME,
COMPACTION_COORDINATOR_FINALIZER_QUEUE_SIZE);
++ MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME);
/**
* Checks if the given property may be changed via Zookeeper, but not
recognized until the restart
