This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 85796e59b9 Merge branch '2.1' add 3a2f60ef87 Fix positional argument in format string (#3345) add 0dae0a2b7d Bump plugins and build-related deps (#3344) add 71f7012c90 Fix Teardown documentation in 1.10 User Manual (#3300) add 9938d99127 Fix errors in Range javadoc (#3343) new 74009a5056 Merge branch '1.10' into 2.1 new e29b58d561 Merge branch '2.1' The 2 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: .../java/org/apache/accumulo/core/data/Range.java | 22 ++++++------ .../blockfile/cache/tinylfu/TinyLfuBlockCache.java | 2 +- .../system/SourceSwitchingIterator.java | 12 +++---- .../apache/accumulo/core/logging/TabletLogger.java | 2 +- .../core/metadata/schema/TabletMetadata.java | 2 +- .../accumulo/core/spi/crypto/AESCryptoService.java | 4 +-- .../spi/crypto/PerTableCryptoServiceFactory.java | 2 +- .../accumulo/core/spi/fs/DelegatingChooser.java | 4 +-- .../core/spi/fs/PreferredVolumeChooser.java | 2 +- .../core/util/compaction/CompactionJobImpl.java | 2 +- .../org/apache/accumulo/core/WithTestNames.java | 2 +- .../core/conf/AccumuloConfigurationTest.java | 32 ++++++++--------- .../system/SourceSwitchingIteratorTest.java | 7 ++-- .../mapreduce/FileOutputFormatBuilderImpl.java | 12 +++---- .../mapreduce/InputFormatBuilderImpl.java | 6 ++-- .../mapreduce/OutputFormatBuilderImpl.java | 2 +- .../apache/accumulo/hadoop/its/WithTestNames.java | 2 +- .../mapreduce/InputFormatBuilderTest.java | 2 +- .../MiniAccumuloClusterControl.java | 2 +- .../apache/accumulo/minicluster/WithTestNames.java | 2 +- pom.xml | 40 +++++++++++++++------- .../server/client/ClientServiceHandler.java | 9 +++-- .../org/apache/accumulo/server/util/ECAdmin.java | 2 +- .../accumulo/server/util/ManagerMetadataUtil.java | 4 +-- .../org/apache/accumulo/server/WithTestNames.java | 2 +- .../accumulo/server/util/TableDiskUsageTest.java | 15 +++++--- .../org/apache/accumulo/compactor/Compactor.java | 5 +-- .../org/apache/accumulo/manager/WithTestNames.java | 2 +- .../java/org/apache/accumulo/monitor/Monitor.java | 4 +-- .../tserver/TabletServerResourceManager.java | 2 +- .../tserver/compactions/CompactionService.java | 6 ++-- .../org/apache/accumulo/tserver/log/DfsLogger.java | 2 +- .../accumulo/tserver/tablet/CompactableImpl.java | 32 +++++++++-------- .../accumulo/tserver/tablet/DatafileManager.java | 6 ++-- .../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +-- .../org/apache/accumulo/tserver/WithTestNames.java | 2 +- .../tserver/tablet/CompactableImplTest.java | 2 +- .../org/apache/accumulo/harness/WithTestNames.java | 2 +- .../compaction/ExternalCompactionTestUtils.java | 4 +-- .../accumulo/test/functional/MetadataIT.java | 4 +-- .../accumulo/test/functional/YieldingIterator.java | 9 ++--- .../org/apache/accumulo/test/shell/ShellIT.java | 2 +- 42 files changed, 157 insertions(+), 126 deletions(-)