This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 374f2c1a6c Fix HTML headings in javadoc, change from h3 to h4 (#4104) add 3e842b544e Fix 4100 - move header length check to test (#4101) add e2b48d57a5 revert disruptor version to 3.4.4 for log4j compatibility (#4105) add ebd7291f6c Merge remote-tracking branch 'upstream/2.1' add a7aca3325d Use a Map for volume replacements (#4103) add 819a0cefb7 Avoid DfsLogger unencrypted WAL special case (#4102) new 18327450ee Merge branch '2.1' new 2890cc2c99 Trivial variable rename (for #4103) new 48d3971914 Merge branch 'main' into elasticity The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 3 +- .../org/apache/accumulo/server/ServerContext.java | 4 +- .../org/apache/accumulo/server/ServerDirs.java | 33 +++++----- .../org/apache/accumulo/server/fs/VolumeUtil.java | 61 +++++++----------- .../apache/accumulo/server/init/Initialize.java | 5 +- .../manager/state/TabletManagementParameters.java | 12 ++-- .../apache/accumulo/server/fs/VolumeUtilTest.java | 75 ++++++++++------------ .../main/java/org/apache/accumulo/gc/GCRun.java | 3 +- .../accumulo/manager/TabletGroupWatcher.java | 2 +- .../accumulo/manager/recovery/RecoveryManager.java | 2 +- .../org/apache/accumulo/tserver/log/DfsLogger.java | 28 ++++---- .../apache/accumulo/tserver/logger/LogReader.java | 5 -- .../apache/accumulo/tserver/log/DfsLoggerTest.java | 9 +++ .../functional/TabletManagementIteratorIT.java | 10 ++- 14 files changed, 111 insertions(+), 141 deletions(-)