This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 1ad72a5f2a Merge branch '2.1' add eb681a9da7 Fix String-to-bytes and bytes-to-String for UTF-8 Pt. 2 (#4791) new 003cdf333d Merge remote-tracking branch 'upstream/2.1' The 1 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: .../core/client/lexicoder/BytesLexicoderTest.java | 4 +- .../core/client/lexicoder/LexicoderTest.java | 5 +- .../core/clientImpl/TabletLocatorImplTest.java | 5 +- .../core/clientImpl/lexicoder/ByteUtilsTest.java | 15 +-- .../accumulo/core/conf/ClientPropertyTest.java | 7 +- .../apache/accumulo/core/crypto/CryptoTest.java | 5 +- .../org/apache/accumulo/core/data/ColumnTest.java | 7 +- .../org/apache/accumulo/core/data/KeyTest.java | 38 ++++---- .../apache/accumulo/core/data/MutationTest.java | 101 +++++++++++---------- .../org/apache/accumulo/core/data/RangeTest.java | 12 +-- .../zookeeper/DistributedReadWriteLockTest.java | 3 +- .../core/file/rfile/CreateCompatTestFile.java | 5 +- .../core/file/rfile/GenerateSplitsTest.java | 3 +- .../accumulo/core/file/rfile/KeyShortenerTest.java | 11 ++- .../core/file/rfile/MultiThreadedRFileTest.java | 4 +- .../apache/accumulo/core/file/rfile/RFileTest.java | 6 +- .../core/iterators/system/ColumnFilterTest.java | 5 +- .../iterators/system/VisibilityFilterTest.java | 4 +- .../accumulo/core/iterators/user/FilterTest.java | 23 ++--- .../iterators/user/IndexedDocIteratorTest.java | 17 ++-- .../core/iterators/user/RegExFilterTest.java | 5 +- .../iterators/user/RowDeletingIteratorTest.java | 5 +- .../iterators/user/VersioningIteratorTest.java | 3 +- .../accumulo/core/security/AuthorizationsTest.java | 3 +- .../core/security/ColumnVisibilityTest.java | 8 +- .../balancer/HostRegexTableLoadBalancerTest.java | 8 +- .../hadoop/its/mapred/AccumuloInputFormatIT.java | 5 +- .../hadoop/its/mapred/AccumuloOutputFormatIT.java | 9 +- .../its/mapred/AccumuloRowInputFormatIT.java | 11 ++- .../hadoop/its/mapred/MultiTableInputFormatIT.java | 5 +- .../accumulo/hadoop/its/mapred/TokenFileIT.java | 9 +- .../its/mapreduce/AccumuloInputFormatIT.java | 5 +- .../its/mapreduce/AccumuloOutputFormatIT.java | 9 +- .../its/mapreduce/AccumuloRowInputFormatIT.java | 11 ++- .../its/mapreduce/MultiTableInputFormatIT.java | 5 +- .../accumulo/hadoop/its/mapreduce/RowHashIT.java | 5 +- .../accumulo/hadoop/its/mapreduce/TokenFileIT.java | 9 +- .../miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +- .../accumulo/server/data/ServerMutationTest.java | 21 +++-- .../security/handler/ZKAuthenticatorTest.java | 2 +- .../tableOps/compact/CompactionDriverTest.java | 5 +- .../org/apache/accumulo/monitor/it/WebViewsIT.java | 3 +- .../accumulo/tserver/CheckTabletMetadataTest.java | 5 +- .../accumulo/tserver/TservConstraintEnvTest.java | 3 +- .../shell/commands/HistoryCommandTest.java | 4 +- .../apache/accumulo/test/ConditionalWriterIT.java | 8 +- .../org/apache/accumulo/test/InMemoryMapIT.java | 3 +- .../apache/accumulo/test/MultiTableRecoveryIT.java | 3 +- .../org/apache/accumulo/test/VerifyIngest.java | 6 +- .../accumulo/test/functional/AuthsIterator.java | 4 +- .../accumulo/test/functional/CombinerIT.java | 3 +- .../accumulo/test/functional/KerberosIT.java | 3 +- .../test/functional/WatchTheWatchCountIT.java | 5 +- .../accumulo/test/metrics/TestStatsDSink.java | 4 +- 54 files changed, 269 insertions(+), 210 deletions(-)