This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 252b1e283394e0b0c77c192cbf9ad459c9a1a1d1 Merge: 878e4edfee 8bb8fcea89 Author: Daniel Roberts <ddani...@gmail.com> AuthorDate: Wed Feb 7 00:28:05 2024 +0000 Merge branch 'main' into elasticity core/src/main/java/org/apache/accumulo/core/conf/Property.java | 1 - .../apache/accumulo/server/compaction/RetryableThriftCall.java | 9 ++++++++- .../src/main/java/org/apache/accumulo/tserver/ScanServer.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)