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 9bbde86a68 Remove deprecated replication (#3080)
     add dbf202f2dd Update javadoc tag style to match google style guide (#3064)
     new 5c870af501 Merge branch '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:
 contrib/Eclipse-Accumulo-Codestyle.xml             |   4 +-
 .../accumulo/core/bloomfilter/BloomFilter.java     |   9 +-
 .../core/bloomfilter/DynamicBloomFilter.java       |  15 +-
 .../apache/accumulo/core/bloomfilter/Filter.java   |  24 +-
 .../org/apache/accumulo/core/cli/ClientOpts.java   |   3 +-
 .../java/org/apache/accumulo/core/cli/Help.java    |   3 +-
 .../accumulo/core/client/AccumuloClient.java       | 217 +++----
 .../accumulo/core/client/AccumuloException.java    |  12 +-
 .../core/client/AccumuloSecurityException.java     |  39 +-
 .../apache/accumulo/core/client/BatchDeleter.java  |   9 +-
 .../apache/accumulo/core/client/BatchScanner.java  |   3 +-
 .../apache/accumulo/core/client/BatchWriter.java   |  22 +-
 .../accumulo/core/client/BatchWriterConfig.java    |  87 +--
 .../core/client/ClientSideIteratorScanner.java     |  19 +-
 .../accumulo/core/client/ConditionalWriter.java    |   6 +-
 .../core/client/ConditionalWriterConfig.java       |  38 +-
 .../accumulo/core/client/IsolatedScanner.java      |   4 +-
 .../accumulo/core/client/IteratorSetting.java      | 101 ++-
 .../core/client/MultiTableBatchWriter.java         |  18 +-
 .../core/client/MutationsRejectedException.java    |  15 +-
 .../core/client/NamespaceExistsException.java      |  24 +-
 .../core/client/NamespaceNotEmptyException.java    |  24 +-
 .../core/client/NamespaceNotFoundException.java    |  24 +-
 .../accumulo/core/client/PluginEnvironment.java    |  15 +-
 .../apache/accumulo/core/client/RowIterator.java   |  18 +-
 .../org/apache/accumulo/core/client/Scanner.java   |   9 +-
 .../apache/accumulo/core/client/ScannerBase.java   |  67 +-
 .../accumulo/core/client/TableExistsException.java |  24 +-
 .../core/client/TableNotFoundException.java        |  32 +-
 .../core/client/admin/CloneConfiguration.java      |  12 +-
 .../core/client/admin/CompactionConfig.java        |  33 +-
 .../client/admin/CompactionStrategyConfig.java     |  14 +-
 .../core/client/admin/DelegationTokenConfig.java   |   9 +-
 .../accumulo/core/client/admin/DiskUsage.java      |   6 +-
 .../apache/accumulo/core/client/admin/FindMax.java |  25 +-
 .../core/client/admin/ImportConfiguration.java     |   9 +-
 .../core/client/admin/InstanceOperations.java      |  55 +-
 .../core/client/admin/NamespaceOperations.java     | 305 ++++-----
 .../core/client/admin/NewTableConfiguration.java   |  24 +-
 .../accumulo/core/client/admin/PluginConfig.java   |  15 +-
 .../core/client/admin/SecurityOperations.java      | 204 +++---
 .../core/client/admin/TableOperations.java         | 685 ++++++++-------------
 .../core/client/lexicoder/AbstractEncoder.java     |   7 +-
 .../core/client/lexicoder/BigIntegerLexicoder.java |   3 +-
 .../core/client/lexicoder/DoubleLexicoder.java     |  10 +-
 .../core/client/lexicoder/ReverseLexicoder.java    |   6 +-
 .../core/client/lexicoder/SequenceLexicoder.java   |   6 +-
 .../core/client/lexicoder/UIntegerLexicoder.java   |  12 +-
 .../core/client/lexicoder/ULongLexicoder.java      |  12 +-
 .../apache/accumulo/core/client/rfile/RFile.java   |  93 +--
 .../accumulo/core/client/rfile/RFileWriter.java    |  72 +--
 .../core/client/sample/AbstractHashSampler.java    |   9 +-
 .../accumulo/core/client/sample/Sampler.java       |   9 +-
 .../security/tokens/AuthenticationToken.java       |  21 +-
 .../core/client/security/tokens/KerberosToken.java |  25 +-
 .../core/client/security/tokens/PasswordToken.java |   3 +-
 .../core/client/summary/CounterSummary.java        |  14 +-
 .../core/client/summary/CountingSummarizer.java    |   8 +-
 .../accumulo/core/client/summary/Summarizer.java   |   3 +-
 .../client/summary/SummarizerConfiguration.java    |  20 +-
 .../accumulo/core/clientImpl/ActiveScanImpl.java   |   3 +-
 .../clientImpl/AuthenticationTokenIdentifier.java  |   8 +-
 .../accumulo/core/clientImpl/BatchWriterImpl.java  |   3 +-
 .../accumulo/core/clientImpl/ClientContext.java    |  15 +-
 .../core/clientImpl/ConditionalWriterImpl.java     |  78 ++-
 .../accumulo/core/clientImpl/Credentials.java      |  31 +-
 .../DelegationTokenConfigSerializer.java           |   6 +-
 .../core/clientImpl/InstanceOperationsImpl.java    |   6 +-
 .../core/clientImpl/NamespaceOperationsHelper.java |  42 +-
 .../core/clientImpl/NamespaceOperationsImpl.java   |  15 +-
 .../accumulo/core/clientImpl/Namespaces.java       |  26 +-
 .../accumulo/core/clientImpl/OfflineIterator.java  |  26 +-
 .../core/clientImpl/RootTabletLocator.java         |   5 +-
 .../accumulo/core/clientImpl/ScannerImpl.java      |   8 +-
 .../accumulo/core/clientImpl/ScannerIterator.java  |  15 +-
 .../core/clientImpl/SecurityOperationsImpl.java    |  50 +-
 .../core/clientImpl/TableOperationsHelper.java     |  30 +-
 .../core/clientImpl/TableOperationsImpl.java       |  91 +--
 .../accumulo/core/clientImpl/TabletLocator.java    |   6 +-
 .../core/clientImpl/TabletLocatorImpl.java         |  79 ++-
 .../TabletServerBatchReaderIterator.java           |  69 ++-
 .../core/clientImpl/TabletServerBatchWriter.java   |  65 +-
 .../accumulo/core/clientImpl/TabletType.java       |  14 +-
 .../accumulo/core/clientImpl/ThriftScanner.java    |  81 ++-
 .../core/clientImpl/ThriftTransportKey.java        |   3 +-
 .../core/clientImpl/ThriftTransportPool.java       |  22 +-
 .../core/clientImpl/TimeoutTabletLocator.java      |  15 +-
 .../apache/accumulo/core/clientImpl/Writer.java    |   3 +-
 .../apache/accumulo/core/clientImpl/bulk/Bulk.java |  12 +-
 .../accumulo/core/clientImpl/bulk/BulkImport.java  |  26 +-
 .../clientImpl/bulk/ConcurrentKeyExtentCache.java  |   6 +-
 .../core/clientImpl/lexicoder/ByteUtils.java       |   9 +-
 .../core/compaction/CompactionSettings.java        |   5 +-
 .../accumulo/core/conf/AccumuloConfiguration.java  |  65 +-
 .../accumulo/core/conf/ClientConfigGenerate.java   |   6 +-
 .../apache/accumulo/core/conf/ClientProperty.java  |   6 +-
 .../apache/accumulo/core/conf/ConfigCheckUtil.java |  33 +-
 .../accumulo/core/conf/ConfigurationCopy.java      |  21 +-
 .../accumulo/core/conf/ConfigurationDocGen.java    |  12 +-
 .../core/conf/ConfigurationTypeHelper.java         |  39 +-
 .../accumulo/core/conf/DeprecatedPropertyUtil.java |  12 +-
 .../core/conf/HadoopCredentialProvider.java        |  24 +-
 .../org/apache/accumulo/core/conf/Property.java    |  54 +-
 .../accumulo/core/constraints/Constraint.java      |   9 +-
 .../core/constraints/DefaultKeySizeConstraint.java |   6 +-
 .../accumulo/core/constraints/Violations.java      |  12 +-
 .../core/constraints/VisibilityConstraint.java     |  15 +-
 .../accumulo/core/crypto/CryptoFactoryLoader.java  |   3 +-
 .../core/crypto/streams/BlockedInputStream.java    |  37 +-
 .../core/crypto/streams/BlockedOutputStream.java   |  20 +-
 .../crypto/streams/RFileCipherOutputStream.java    |   6 +-
 .../accumulo/core/data/ArrayByteSequence.java      |  25 +-
 .../apache/accumulo/core/data/ByteSequence.java    |  30 +-
 .../java/org/apache/accumulo/core/data/Column.java |  27 +-
 .../apache/accumulo/core/data/ColumnUpdate.java    |  24 +-
 .../org/apache/accumulo/core/data/Condition.java   |  89 +--
 .../core/data/ConstraintViolationSummary.java      |  15 +-
 .../org/apache/accumulo/core/data/InstanceId.java  |   6 +-
 .../java/org/apache/accumulo/core/data/Key.java    | 304 ++++-----
 .../org/apache/accumulo/core/data/KeyBuilder.java  |  99 ++-
 .../org/apache/accumulo/core/data/KeyValue.java    |  18 +-
 .../org/apache/accumulo/core/data/LoadPlan.java    |  15 +-
 .../org/apache/accumulo/core/data/Mutation.java    | 468 +++++---------
 .../org/apache/accumulo/core/data/NamespaceId.java |   3 +-
 .../java/org/apache/accumulo/core/data/Range.java  | 422 +++++--------
 .../org/apache/accumulo/core/data/TableId.java     |   3 +-
 .../java/org/apache/accumulo/core/data/Value.java  |  43 +-
 .../accumulo/core/data/constraints/Constraint.java |   9 +-
 .../data/constraints/DefaultKeySizeConstraint.java |   6 +-
 .../data/constraints/VisibilityConstraint.java     |  15 +-
 .../accumulo/core/dataImpl/ComparableBytes.java    |   3 +-
 .../apache/accumulo/core/dataImpl/KeyExtent.java   |  48 +-
 .../org/apache/accumulo/core/fate/AdminUtil.java   | 100 ++-
 .../org/apache/accumulo/core/fate/AgeOffStore.java |   9 +-
 .../java/org/apache/accumulo/core/fate/Fate.java   |  24 +-
 .../apache/accumulo/core/fate/ReadOnlyTStore.java  |  30 +-
 .../java/org/apache/accumulo/core/fate/TStore.java |  27 +-
 .../org/apache/accumulo/core/fate/ZooStore.java    |  61 +-
 .../fate/zookeeper/DistributedReadWriteLock.java   |  27 +-
 .../accumulo/core/fate/zookeeper/FateLock.java     |   3 +-
 .../accumulo/core/fate/zookeeper/ServiceLock.java  |  23 +-
 .../accumulo/core/fate/zookeeper/ZooCache.java     |  33 +-
 .../core/fate/zookeeper/ZooCacheFactory.java       |  12 +-
 .../core/fate/zookeeper/ZooReaderWriter.java       |  21 +-
 .../core/fate/zookeeper/ZooReservation.java        |   3 +-
 .../accumulo/core/fate/zookeeper/ZooSession.java   |  45 +-
 .../accumulo/core/fate/zookeeper/ZooUtil.java      |   8 +-
 .../accumulo/core/file/BloomFilterLayer.java       |  36 +-
 .../cache/impl/BlockCacheManagerFactory.java       |  12 +-
 .../core/file/blockfile/cache/impl/ClassSize.java  |   6 +-
 .../core/file/blockfile/cache/lru/CachedBlock.java |   3 +-
 .../file/blockfile/cache/lru/CachedBlockQueue.java |  12 +-
 .../file/blockfile/cache/lru/LruBlockCache.java    |  36 +-
 .../cache/lru/SynchronousLoadingBlockCache.java    |   3 +-
 .../file/blockfile/impl/CachableBlockFile.java     |   6 +-
 .../impl/SeekableByteArrayInputStream.java         |  11 +-
 .../accumulo/core/file/keyfunctor/RowFunctor.java  |   3 +-
 .../accumulo/core/file/map/MapFileOperations.java  |   9 +-
 .../accumulo/core/file/rfile/BlockIndex.java       |  35 +-
 .../accumulo/core/file/rfile/GenerateSplits.java   |  19 +-
 .../accumulo/core/file/rfile/IndexIterator.java    |  10 +-
 .../accumulo/core/file/rfile/MetricsGatherer.java  |  26 +-
 .../accumulo/core/file/rfile/MultiLevelIndex.java  |  50 +-
 .../apache/accumulo/core/file/rfile/PrintInfo.java |   3 +-
 .../org/apache/accumulo/core/file/rfile/RFile.java | 104 ++--
 .../accumulo/core/file/rfile/RFileOperations.java  |   3 +-
 .../accumulo/core/file/rfile/RelativeKey.java      |  58 +-
 .../core/file/rfile/VisMetricsGatherer.java        |  14 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java    |  31 +-
 .../core/file/rfile/bcfile/IdentityCodec.java      |  12 +-
 .../file/rfile/bcfile/MetaBlockAlreadyExists.java  |   3 +-
 .../file/rfile/bcfile/MetaBlockDoesNotExist.java   |   3 +-
 .../accumulo/core/file/rfile/bcfile/Utils.java     |  45 +-
 .../file/streams/BoundedRangeFileInputStream.java  |  22 +-
 .../org/apache/accumulo/core/gc/ReferenceFile.java |   9 +-
 .../apache/accumulo/core/iterators/Combiner.java   |  55 +-
 .../org/apache/accumulo/core/iterators/Filter.java |   8 +-
 .../core/iterators/FirstEntryInRowIterator.java    |  12 +-
 .../core/iterators/IteratorEnvironment.java        |   3 +-
 .../accumulo/core/iterators/LongCombiner.java      |  36 +-
 .../accumulo/core/iterators/OptionDescriber.java   |  45 +-
 .../apache/accumulo/core/iterators/OrIterator.java |   6 +-
 .../core/iterators/SortedKeyValueIterator.java     |  69 +--
 .../core/iterators/TypedValueCombiner.java         |  55 +-
 .../accumulo/core/iterators/WrappingIterator.java  |  15 +-
 .../accumulo/core/iterators/YieldCallback.java     |   3 +-
 .../accumulo/core/iterators/user/AgeOffFilter.java |  26 +-
 .../core/iterators/user/BigDecimalCombiner.java    |   9 +-
 .../core/iterators/user/ColumnAgeOffFilter.java    |  21 +-
 .../core/iterators/user/IndexedDocIterator.java    |  49 +-
 .../core/iterators/user/IntersectingIterator.java  |  23 +-
 .../core/iterators/user/LargeRowFilter.java        |  15 +-
 .../accumulo/core/iterators/user/MaxCombiner.java  |   3 +-
 .../accumulo/core/iterators/user/MinCombiner.java  |   3 +-
 .../accumulo/core/iterators/user/RegExFilter.java  |  77 ++-
 .../core/iterators/user/RowDeletingIterator.java   |   3 +-
 .../core/iterators/user/RowEncodingIterator.java   |  22 +-
 .../accumulo/core/iterators/user/RowFilter.java    |  19 +-
 .../core/iterators/user/SeekingFilter.java         |  12 +-
 .../core/iterators/user/SummingArrayCombiner.java  |  32 +-
 .../core/iterators/user/TimestampFilter.java       | 140 ++---
 .../core/iterators/user/TransformingIterator.java  |  75 ++-
 .../core/iterators/user/VersioningIterator.java    |  26 +-
 .../core/iterators/user/VisibilityFilter.java      |   6 +-
 .../iterators/user/WholeColumnFamilyIterator.java  |  43 +-
 .../core/iteratorsImpl/IteratorConfigUtil.java     |   8 +-
 .../core/iteratorsImpl/conf/ColumnSet.java         |   9 +-
 .../core/iteratorsImpl/conf/ColumnUtil.java        |  15 +-
 .../system/ColumnFamilySkippingIterator.java       |   5 +-
 .../system/ColumnQualifierFilter.java              |   3 +-
 .../iteratorsImpl/system/DeletingIterator.java     |   5 +-
 .../core/iteratorsImpl/system/HeapIterator.java    |   3 +-
 .../system/LocalityGroupIterator.java              |  39 +-
 .../core/iteratorsImpl/system/MapFileIterator.java |  12 +-
 .../core/iteratorsImpl/system/MultiIterator.java   |   6 +-
 .../iteratorsImpl/system/SequenceFileIterator.java |   8 +-
 .../iteratorsImpl/system/SortedMapIterator.java    |  15 +-
 .../system/SourceSwitchingIterator.java            |  23 +-
 .../iteratorsImpl/system/VisibilityFilter.java     |   8 +-
 .../apache/accumulo/core/logging/FateLogger.java   |  18 +-
 .../apache/accumulo/core/logging/TabletLogger.java |   5 +-
 .../core/manager/balancer/TServerStatusImpl.java   |   6 +-
 .../core/manager/balancer/TableStatisticsImpl.java |   6 +-
 .../core/manager/balancer/TabletServerIdImpl.java  |   6 +-
 .../manager/balancer/TabletStatisticsImpl.java     |   6 +-
 .../core/metadata/MetadataLocationObtainer.java    |  14 +-
 .../accumulo/core/metadata/MetadataServicer.java   |  10 +-
 .../core/metadata/ScanServerRefTabletFile.java     |   9 +-
 .../accumulo/core/metadata/StoredTabletFile.java   |   3 +-
 .../accumulo/core/metadata/TServerInstance.java    |   3 +-
 .../core/metadata/TableMetadataServicer.java       |  15 +-
 .../core/metadata/TabletLocationState.java         |  12 +-
 .../accumulo/core/metadata/schema/Ample.java       |  41 +-
 .../accumulo/core/metadata/schema/AmpleImpl.java   |   3 +-
 .../core/metadata/schema/DataFileValue.java        |  11 +-
 .../schema/ExternalCompactionFinalState.java       |   3 +-
 .../core/metadata/schema/ExternalCompactionId.java |   3 +-
 .../core/metadata/schema/MetadataSchema.java       |   3 +-
 .../core/metadata/schema/MetadataTime.java         |  17 +-
 .../accumulo/core/metadata/schema/SortSkew.java    |   3 +-
 .../core/metadata/schema/TabletsMetadata.java      |   3 +-
 .../rpc/ProtocolOverridingSSLSocketFactory.java    |   3 +-
 .../core/rpc/SaslDigestCallbackHandler.java        |  15 +-
 .../accumulo/core/rpc/SslConnectionParams.java     |  39 +-
 .../accumulo/core/rpc/TTimeoutTransport.java       |  27 +-
 .../org/apache/accumulo/core/rpc/ThriftUtil.java   |  75 +--
 .../accumulo/core/rpc/clients/ManagerClient.java   |   3 +-
 .../core/rpc/clients/ManagerThriftClient.java      |   6 +-
 .../accumulo/core/rpc/clients/TServerClient.java   |   3 +-
 .../core/rpc/clients/ThriftClientTypes.java        |  12 +-
 .../core/sample/impl/SamplerConfigurationImpl.java |   6 +-
 .../accumulo/core/sample/impl/SamplerFactory.java  |   5 +-
 .../core/security/AuthorizationContainer.java      |   3 +-
 .../accumulo/core/security/Authorizations.java     |  44 +-
 .../accumulo/core/security/ColumnVisibility.java   | 106 ++--
 .../core/security/NamespacePermission.java         |  15 +-
 .../accumulo/core/security/SystemPermission.java   |  15 +-
 .../accumulo/core/security/TablePermission.java    |  15 +-
 .../core/security/VisibilityEvaluator.java         |  47 +-
 .../core/security/VisibilityParseException.java    |   9 +-
 .../accumulo/core/singletons/SingletonManager.java |   6 +-
 .../core/spi/balancer/BalancerEnvironment.java     |  18 +-
 .../spi/balancer/HostRegexTableLoadBalancer.java   |   9 +-
 .../core/spi/balancer/SimpleLoadBalancer.java      |  30 +-
 .../core/spi/balancer/TableLoadBalancer.java       |   9 +-
 .../core/spi/balancer/data/TabletMigration.java    |   6 +-
 .../apache/accumulo/core/spi/cache/BlockCache.java |  18 +-
 .../accumulo/core/spi/cache/BlockCacheManager.java |  22 +-
 .../core/spi/common/ContextClassLoaderFactory.java |   5 +-
 .../core/spi/compaction/CompactionPlan.java        |  13 +-
 .../spi/compaction/DefaultCompactionPlanner.java   |  21 +-
 .../spi/compaction/SimpleCompactionDispatcher.java |   5 +-
 .../accumulo/core/spi/crypto/AESCryptoService.java |  22 +-
 .../core/spi/crypto/CryptoServiceFactory.java      |   6 +-
 .../accumulo/core/spi/fs/DelegatingChooser.java    |  12 +-
 .../apache/accumulo/core/spi/fs/VolumeChooser.java |  12 +-
 .../spi/scan/ConfigurableScanServerSelector.java   |   6 +-
 .../accumulo/core/spi/scan/ScanDispatch.java       |  13 +-
 .../accumulo/core/spi/scan/ScanDispatcher.java     |   3 +-
 .../accumulo/core/spi/scan/ScanServerSelector.java |   3 +-
 .../org/apache/accumulo/core/summary/Gatherer.java |   3 +-
 .../org/apache/accumulo/core/trace/TraceUtil.java  |  12 +-
 .../org/apache/accumulo/core/util/AddressUtil.java |  10 +-
 .../apache/accumulo/core/util/ByteArraySet.java    |   3 +-
 .../apache/accumulo/core/util/ByteBufferUtil.java  |  18 +-
 .../org/apache/accumulo/core/util/ColumnFQ.java    |   9 +-
 .../org/apache/accumulo/core/util/CreateToken.java |   3 +-
 .../org/apache/accumulo/core/util/Encoding.java    |   3 +-
 .../org/apache/accumulo/core/util/FastFormat.java  |   6 +-
 .../java/org/apache/accumulo/core/util/Halt.java   |   3 +-
 .../org/apache/accumulo/core/util/HostAndPort.java |  30 +-
 .../accumulo/core/util/LocalityGroupUtil.java      |   3 +-
 .../java/org/apache/accumulo/core/util/Merge.java  |   6 +-
 .../org/apache/accumulo/core/util/NumUtil.java     |   6 +-
 .../org/apache/accumulo/core/util/OpTimer.java     |  12 +-
 .../apache/accumulo/core/util/PeekingIterator.java |  24 +-
 .../java/org/apache/accumulo/core/util/Retry.java  |  51 +-
 .../apache/accumulo/core/util/ServerServices.java  |   3 +-
 .../apache/accumulo/core/util/ShutdownUtil.java    |  12 +-
 .../org/apache/accumulo/core/util/StopWatch.java   |   9 +-
 .../org/apache/accumulo/core/util/TextUtil.java    |   3 +-
 .../accumulo/core/util/ThriftMessageUtil.java      |  15 +-
 .../accumulo/core/util/UnsynchronizedBuffer.java   |  56 +-
 .../org/apache/accumulo/core/util/Validator.java   |  24 +-
 .../org/apache/accumulo/core/util/Validators.java  |  73 ++-
 .../accumulo/core/util/cleaner/CleanerUtil.java    |  21 +-
 .../core/util/compaction/CompactionJobImpl.java    |   7 +-
 .../util/compaction/ExternalCompactionUtil.java    |  24 +-
 .../core/util/format/AggregatingFormatter.java     |   6 +-
 .../accumulo/core/util/format/BinaryFormatter.java |   3 +-
 .../core/util/format/DefaultFormatter.java         |  13 +-
 .../accumulo/core/util/format/FormatterConfig.java |   3 +-
 .../accumulo/core/util/format/HexFormatter.java    |   6 +-
 .../format/ShardedTableDistributionFormatter.java  |   7 +-
 .../util/format/StatisticsDisplayFormatter.java    |   9 +-
 .../core/util/ratelimit/GuavaRateLimiter.java      |  10 +-
 .../util/ratelimit/SharedRateLimiterFactory.java   |   8 +-
 .../accumulo/core/util/tables/TableNameUtil.java   |   5 +-
 .../accumulo/core/util/tables/TableZooHelper.java  |  25 +-
 .../accumulo/core/util/threads/ThreadPools.java    | 224 +++----
 .../org/apache/accumulo/core/volume/Volume.java    |   3 +-
 .../accumulo/core/client/RowIteratorTest.java      |   3 +-
 .../core/client/lexicoder/LexicoderTest.java       |   5 +-
 .../client/security/SecurityErrorCodeTest.java     |   6 +-
 .../client/summary/CountingSummarizerTest.java     |   3 +-
 .../core/clientImpl/TableOperationsHelperTest.java |   9 +-
 .../core/clientImpl/TabletLocatorImplTest.java     |  37 +-
 .../core/clientImpl/bulk/BulkSerializeTest.java    |   3 +-
 .../DeprecatedConstraintExtendTest.java            |   6 +-
 .../apache/accumulo/core/crypto/CryptoTest.java    |   3 +-
 .../org/apache/accumulo/core/data/ColumnTest.java  |  16 +-
 .../apache/accumulo/core/data/MutationTest.java    |   9 +-
 .../org/apache/accumulo/core/data/OldMutation.java |  42 +-
 .../org/apache/accumulo/core/data/RangeTest.java   |  21 +-
 .../org/apache/accumulo/core/fate/TestStore.java   |  20 +-
 .../zookeeper/DistributedReadWriteLockTest.java    |   6 +-
 .../accumulo/core/file/rfile/BlockIndexTest.java   |  11 +-
 .../core/file/rfile/GenerateSplitsTest.java        |   6 +-
 .../core/file/rfile/MultiLevelIndexTest.java       |   8 +-
 .../apache/accumulo/core/file/rfile/RFileTest.java |  69 ++-
 .../core/file/rfile/bcfile/DummyCodec.java         |  33 +-
 .../system/ColumnFamilySkippingIteratorTest.java   |   3 +-
 .../core/iterators/system/MultiIteratorTest.java   |  44 +-
 .../system/SourceSwitchingIteratorTest.java        |   9 +-
 .../accumulo/core/iterators/user/CombinerTest.java |   6 +-
 .../iterators/user/IntersectingIteratorTest.java   |  15 +-
 .../core/iterators/user/VisibilityFilterTest.java  |  21 +-
 .../core/spi/balancer/SimpleLoadBalancerTest.java  |  24 +-
 .../core/spi/fs/SpaceAwareVolumeChooserTest.java   |   6 +-
 .../org/apache/accumulo/core/util/MergeTest.java   |  11 +-
 .../apache/accumulo/core/util/PartitionerTest.java |   6 +-
 .../hadoop/mapred/AccumuloFileOutputFormat.java    |   3 +-
 .../hadoop/mapred/AccumuloInputFormat.java         |   8 +-
 .../hadoop/mapred/AccumuloOutputFormat.java        |   3 +-
 .../hadoop/mapred/AccumuloRowInputFormat.java      |   8 +-
 .../hadoop/mapreduce/AccumuloFileOutputFormat.java |   3 +-
 .../hadoop/mapreduce/AccumuloInputFormat.java      |   8 +-
 .../hadoop/mapreduce/AccumuloOutputFormat.java     |   3 +-
 .../hadoop/mapreduce/AccumuloRowInputFormat.java   |   8 +-
 .../hadoop/mapreduce/FileOutputFormatBuilder.java  |  21 +-
 .../hadoop/mapreduce/InputFormatBuilder.java       |  33 +-
 .../hadoop/mapreduce/OutputFormatBuilder.java      |   9 +-
 .../hadoopImpl/mapred/AccumuloRecordReader.java    |  33 +-
 .../hadoopImpl/mapred/AccumuloRecordWriter.java    |  26 +-
 .../hadoopImpl/mapreduce/AccumuloRecordReader.java |  36 +-
 .../hadoopImpl/mapreduce/AccumuloRecordWriter.java |  26 +-
 .../hadoopImpl/mapreduce/BatchInputSplit.java      |  12 +-
 .../mapreduce/FileOutputFormatBuilderImpl.java     |  21 +-
 .../hadoopImpl/mapreduce/InputTableConfig.java     |  76 ++-
 .../mapreduce/OutputFormatBuilderImpl.java         |   3 +-
 .../hadoopImpl/mapreduce/RangeInputSplit.java      |   9 +-
 .../accumulo/hadoopImpl/mapreduce/SplitUtils.java  |   8 +-
 .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java |  33 +-
 .../mapreduce/lib/FileOutputConfigurator.java      |  85 ++-
 .../mapreduce/lib/InputConfigurator.java           | 290 ++++-----
 .../mapreduce/lib/OutputConfigurator.java          |  69 +--
 .../its/mapred/AccumuloFileOutputFormatIT.java     |   3 +-
 .../hadoop/its/mapred/AccumuloInputFormatIT.java   |   3 +-
 .../hadoop/its/mapred/AccumuloOutputFormatIT.java  |   3 +-
 .../hadoop/its/mapred/MultiTableInputFormatIT.java |   3 +-
 .../accumulo/hadoop/its/mapred/TokenFileIT.java    |   3 +-
 .../its/mapreduce/AccumuloFileOutputFormatIT.java  |   3 +-
 .../its/mapreduce/AccumuloInputFormatIT.java       |  18 +-
 .../its/mapreduce/AccumuloOutputFormatIT.java      |   3 +-
 .../its/mapreduce/MultiTableInputFormatIT.java     |   3 +-
 .../accumulo/hadoop/its/mapreduce/RowHashIT.java   |   3 +-
 .../accumulo/hadoop/its/mapreduce/TokenFileIT.java |   3 +-
 .../accumulo/iteratortest/IteratorTestCase.java    |   9 +-
 .../accumulo/iteratortest/IteratorTestInput.java   |  66 +-
 .../accumulo/iteratortest/IteratorTestOutput.java  |   3 +-
 .../testcases/IsolatedDeepCopiesTestCase.java      |   6 +-
 .../apache/accumulo/cluster/ClusterControl.java    |  12 +-
 .../org/apache/accumulo/cluster/ClusterUser.java   |   3 +-
 .../org/apache/accumulo/cluster/ClusterUsers.java  |   3 +-
 .../standalone/StandaloneClusterControl.java       |   6 +-
 .../apache/accumulo/minicluster/MemoryUnit.java    |   3 +-
 .../accumulo/minicluster/MiniAccumuloCluster.java  |  16 +-
 .../accumulo/minicluster/MiniAccumuloConfig.java   |  57 +-
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  54 +-
 .../MiniAccumuloClusterControl.java                |   3 +-
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   |  13 +-
 .../miniclusterImpl/MiniAccumuloConfigImpl.java    |  79 +--
 pom.xml                                            |   4 +
 .../org/apache/accumulo/server/ServerContext.java  |   6 +-
 .../org/apache/accumulo/server/ServerOpts.java     |   3 +-
 .../accumulo/server/client/BulkImporter.java       |  57 +-
 .../server/client/ClientServiceHandler.java        |  12 +-
 .../accumulo/server/compaction/CompactionInfo.java |  12 +-
 .../accumulo/server/compaction/FileCompactor.java  |   9 +-
 .../server/compaction/RetryableThriftCall.java     |  17 +-
 .../server/conf/CheckCompactionConfig.java         |   3 +-
 .../server/conf/NamespaceConfiguration.java        |   3 +-
 .../server/conf/RuntimeFixedProperties.java        |   3 +-
 .../accumulo/server/conf/SystemConfiguration.java  |   3 +-
 .../server/conf/codec/EncodingOptions.java         |  15 +-
 .../server/conf/codec/VersionedPropCodec.java      |  54 +-
 .../server/conf/codec/VersionedProperties.java     |  34 +-
 .../accumulo/server/conf/store/PropStore.java      |  78 +--
 .../accumulo/server/conf/store/PropStoreKey.java   |   9 +-
 .../conf/store/impl/PropCacheCaffeineImpl.java     |   3 +-
 .../server/conf/store/impl/PropStoreEventTask.java |   9 +-
 .../server/conf/store/impl/PropStoreWatcher.java   |  15 +-
 .../server/conf/store/impl/ReadyMonitor.java       |   9 +-
 .../server/conf/store/impl/ZooPropLoader.java      |   6 +-
 .../server/conf/store/impl/ZooPropStore.java       |  74 +--
 .../server/conf/util/ConfigTransformer.java        |  34 +-
 .../accumulo/server/conf/util/PropSnapshot.java    |   3 +-
 .../accumulo/server/conf/util/TransformToken.java  |  17 +-
 .../accumulo/server/conf/util/ZooInfoViewer.java   |   6 +-
 .../server/constraints/MetadataConstraints.java    |  21 +-
 .../accumulo/server/data/ServerColumnUpdate.java   |   3 +-
 .../accumulo/server/data/ServerMutation.java       |   3 +-
 .../org/apache/accumulo/server/fs/FileManager.java |  18 +-
 .../apache/accumulo/server/fs/VolumeChooser.java   |  11 +-
 .../server/fs/VolumeChooserEnvironmentImpl.java    |   3 +-
 .../apache/accumulo/server/fs/VolumeManager.java   |   9 +-
 .../accumulo/server/fs/VolumeManagerImpl.java      |  12 +-
 .../org/apache/accumulo/server/fs/VolumeUtil.java  |   9 +-
 .../accumulo/server/init/ZooKeeperInitializer.java |   6 +-
 .../iterators/TabletIteratorEnvironment.java       |  21 +-
 .../accumulo/server/manager/LiveTServerSet.java    |  18 +-
 .../server/manager/recovery/LogCloser.java         |  15 +-
 .../server/manager/recovery/RecoveryPath.java      |   3 +-
 .../manager/state/LoggingTabletStateStore.java     |   6 +-
 .../accumulo/server/manager/state/MergeInfo.java   |  14 +-
 .../server/manager/state/TabletServerState.java    |   6 +-
 .../manager/state/TabletStateChangeIterator.java   |  36 +-
 .../server/manager/state/TabletStateStore.java     |   6 +-
 .../server/manager/state/ZooTabletStateStore.java  |  24 +-
 .../master/balancer/DefaultLoadBalancer.java       |  30 +-
 .../balancer/HostRegexTableLoadBalancer.java       |   9 +-
 .../server/master/balancer/TableLoadBalancer.java  |  15 +-
 .../server/master/balancer/TabletBalancer.java     |  36 +-
 .../server/metadata/RootTabletMutatorImpl.java     |   3 +-
 .../server/metadata/TabletMutatorImpl.java         |   3 +-
 .../apache/accumulo/server/rpc/TServerUtils.java   | 101 ++-
 .../server/security/AuditedSecurityOperation.java  |   6 +-
 .../server/security/SecurityOperation.java         | 105 ++--
 .../accumulo/server/security/SecurityUtil.java     |  31 +-
 .../server/security/SystemCredentials.java         |   3 +-
 .../delegation/AuthenticationTokenKeyManager.java  |  18 +-
 .../AuthenticationTokenSecretManager.java          |  28 +-
 .../ZooAuthenticationKeyDistributor.java           |   6 +-
 .../server/security/handler/ZKAuthenticator.java   |  15 +-
 .../server/security/handler/ZKAuthorizor.java      |   9 +-
 .../server/security/handler/ZKPermHandler.java     |  53 +-
 .../server/security/handler/ZKSecurityTool.java    |  21 +-
 .../accumulo/server/tables/TableManager.java       |  27 +-
 .../apache/accumulo/server/tablets/TabletTime.java |  21 +-
 .../accumulo/server/util/AccumuloStatus.java       |  15 +-
 .../org/apache/accumulo/server/util/Admin.java     |  36 +-
 .../server/util/CheckForMetadataProblems.java      |   8 +-
 .../org/apache/accumulo/server/util/ECAdmin.java   |   5 +-
 .../org/apache/accumulo/server/util/FileUtil.java  |  80 ++-
 .../accumulo/server/util/FindOfflineTablets.java   |  18 +-
 .../accumulo/server/util/ManagerMetadataUtil.java  |  21 +-
 .../accumulo/server/util/MetadataTableUtil.java    |  48 +-
 .../org/apache/accumulo/server/util/PortUtils.java |   3 +-
 .../org/apache/accumulo/server/util/PropUtil.java  |   8 +-
 .../server/util/RemoveEntriesForMissingFiles.java  |  23 +-
 .../accumulo/server/util/TableDiskUsage.java       |  15 +-
 .../apache/accumulo/server/util/TableInfoUtil.java |   9 +-
 .../server/util/VerifyTabletAssignments.java       |  19 +-
 .../server/util/fateCommand/FateTxnDetails.java    |  21 +-
 .../server/util/time/BaseRelativeTime.java         |   3 +-
 .../server/zookeeper/DistributedWorkQueue.java     |  17 +-
 .../server/zookeeper/TransactionWatcher.java       |   6 +-
 .../conf/codec/VersionedPropEncryptCodec.java      |  15 +-
 .../conf/codec/VersionedPropEncryptCodecTest.java  |   3 +-
 .../server/conf/store/impl/ZooPropLoaderTest.java  |   6 +-
 .../server/conf/store/impl/ZooPropStoreTest.java   |  12 +-
 .../iterators/MetadataBulkLoadFilterTest.java      |   6 +-
 .../master/balancer/DefaultLoadBalancerTest.java   |  24 +-
 .../security/handler/ZKAuthenticatorTest.java      |  15 +-
 .../server/zookeeper/TransactionWatcherTest.java   |  18 +-
 .../coordinator/CompactionCoordinator.java         |  90 +--
 .../accumulo/coordinator/QueueAndPriority.java     |   6 +-
 .../org/apache/accumulo/compactor/Compactor.java   |  82 +--
 .../main/java/org/apache/accumulo/gc/GCRun.java    |   6 +-
 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  |  24 +-
 .../accumulo/gc/GarbageCollectionAlgorithm.java    |  18 +-
 .../accumulo/gc/GarbageCollectionEnvironment.java  |  21 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |   6 +-
 .../apache/accumulo/gc/metrics/GcCycleMetrics.java |   9 +-
 .../apache/accumulo/manager/EventCoordinator.java  |   3 +-
 .../accumulo/manager/FateServiceHandler.java       |  91 +--
 .../java/org/apache/accumulo/manager/Manager.java  |   3 +-
 .../manager/ManagerClientServiceHandler.java       |  60 +-
 .../accumulo/manager/TabletGroupWatcher.java       |  57 +-
 .../manager/metrics/fate/FateMetricValues.java     |   9 +-
 .../apache/accumulo/manager/state/MergeStats.java  |  36 +-
 .../apache/accumulo/manager/state/TableStats.java  |   6 +-
 .../manager/tableOps/ChangeTableState.java         |   6 +-
 .../accumulo/manager/tableOps/TraceRepo.java       |   3 +-
 .../apache/accumulo/manager/tableOps/Utils.java    |  29 +-
 .../manager/tableOps/bulkVer1/BulkImport.java      |  24 +-
 .../manager/tableOps/bulkVer1/CopyFailed.java      |  15 +-
 .../manager/tableOps/bulkVer1/LoadFiles.java       |  15 +-
 .../manager/tableOps/bulkVer2/PrepBulkImport.java  |  15 +-
 .../manager/tableOps/clone/CloneZookeeper.java     |   6 +-
 .../manager/tableOps/clone/FinishCloneTable.java   |   3 +-
 .../manager/tableOps/compact/CompactRange.java     |   9 +-
 .../manager/tableOps/compact/CompactionDriver.java |  15 +-
 .../manager/tableOps/create/ChooseDir.java         |   6 +-
 .../accumulo/manager/tableOps/delete/CleanUp.java  |   3 +-
 .../manager/tableOps/merge/TableRangeOp.java       |   9 +-
 .../tableOps/namespace/rename/RenameNamespace.java |   3 +-
 .../manager/tableOps/rename/RenameTable.java       |   8 +-
 .../tableOps/tableExport/WriteExportFiles.java     |   9 +-
 .../tableOps/tableImport/CreateImportDir.java      |  12 +-
 .../tableOps/tableImport/FinishImportTable.java    |   3 +-
 .../manager/tableOps/tableImport/ImportTable.java  |   6 +-
 .../tableOps/tableImport/MapImportFileNames.java   |   3 +-
 .../manager/upgrade/UpgradeCoordinator.java        |   3 +-
 .../apache/accumulo/manager/upgrade/Upgrader.java  |   9 +-
 .../accumulo/manager/upgrade/Upgrader9to10.java    |  21 +-
 .../manager/upgrade/RootFilesUpgradeTest.java      |   6 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |   3 +-
 .../accumulo/monitor/rest/SummaryInformation.java  |  12 +-
 .../org/apache/accumulo/monitor/rest/Totals.java   |   9 +-
 .../monitor/rest/bulkImports/BulkImport.java       |   6 +-
 .../rest/bulkImports/BulkImportInformation.java    |   9 +-
 .../rest/bulkImports/BulkImportResource.java       |   3 +-
 .../TabletServerBulkImportInformation.java         |   9 +-
 .../monitor/rest/compactions/Compactions.java      |   3 +-
 .../monitor/rest/gc/GarbageCollectorStats.java     |   3 +-
 .../monitor/rest/gc/GarbageCollectorStatus.java    |   3 +-
 .../monitor/rest/logs/DeadLoggerInformation.java   |   9 +-
 .../accumulo/monitor/rest/logs/DeadLoggerList.java |   3 +-
 .../monitor/rest/logs/SanitizedLogEvent.java       |   6 +-
 .../monitor/rest/manager/ManagerInformation.java   |  69 +--
 .../monitor/rest/manager/ManagerResource.java      |   3 +-
 .../monitor/rest/problems/ProblemDetail.java       |   3 +-
 .../rest/problems/ProblemDetailInformation.java    |  21 +-
 .../monitor/rest/problems/ProblemSummary.java      |   3 +-
 .../rest/problems/ProblemSummaryInformation.java   |  15 +-
 .../monitor/rest/problems/ProblemsResource.java    |  12 +-
 .../apache/accumulo/monitor/rest/scans/Scans.java  |   3 +-
 .../monitor/rest/status/StatusInformation.java     |  18 +-
 .../monitor/rest/tables/CompactionsList.java       |   6 +-
 .../monitor/rest/tables/CompactionsTypes.java      |   9 +-
 .../monitor/rest/tables/TableInformation.java      |  24 +-
 .../monitor/rest/tables/TableInformationList.java  |   3 +-
 .../monitor/rest/tables/TableNamespace.java        |   6 +-
 .../accumulo/monitor/rest/tables/TablesList.java   |   3 +-
 .../monitor/rest/tables/TablesResource.java        |   3 +-
 .../rest/trace/RecoveryStatusInformation.java      |  12 +-
 .../rest/tservers/AllTimeTabletResults.java        |  24 +-
 .../rest/tservers/BadTabletServerInformation.java  |   6 +-
 .../monitor/rest/tservers/BadTabletServers.java    |   3 +-
 .../monitor/rest/tservers/CurrentOperations.java   |  36 +-
 .../rest/tservers/CurrentTabletResults.java        |  12 +-
 .../rest/tservers/DeadServerInformation.java       |   9 +-
 .../monitor/rest/tservers/DeadServerList.java      |   3 +-
 .../tservers/ServerShuttingDownInformation.java    |   3 +-
 .../monitor/rest/tservers/ServerStats.java         |   3 +-
 .../monitor/rest/tservers/ServersShuttingDown.java |   3 +-
 .../tservers/TabletServerDetailInformation.java    |  15 +-
 .../rest/tservers/TabletServerInformation.java     |   9 +-
 .../tservers/TabletServerRecoveryInformation.java  |  12 +-
 .../rest/tservers/TabletServerResource.java        |   9 +-
 .../monitor/rest/tservers/TabletServerSummary.java |  15 +-
 .../tservers/TabletServerWithTableInformation.java |   6 +-
 .../monitor/rest/tservers/TabletServers.java       |   6 +-
 .../rest/tservers/TabletServersRecovery.java       |   3 +-
 .../util/logging/AccumuloMonitorAppender.java      |   3 +-
 .../org/apache/accumulo/monitor/view/WebViews.java |  12 +-
 .../org/apache/accumulo/monitor/it/WebViewsIT.java |   3 +-
 .../apache/accumulo/tserver/BusiestTracker.java    |   6 +-
 .../accumulo/tserver/ConditionCheckerContext.java  |   5 +-
 .../org/apache/accumulo/tserver/InMemoryMap.java   |  85 ++-
 .../apache/accumulo/tserver/MemKeyComparator.java  |  10 +-
 .../accumulo/tserver/MemKeyConversionIterator.java |   9 +-
 .../org/apache/accumulo/tserver/NativeMap.java     |  29 +-
 .../tserver/PartialMutationSkippingIterator.java   |   3 +-
 .../java/org/apache/accumulo/tserver/RowLocks.java |   8 +-
 .../org/apache/accumulo/tserver/ScanServer.java    |   3 +-
 .../accumulo/tserver/TabletClientHandler.java      |   9 +-
 .../tserver/TabletServerResourceManager.java       |   9 +-
 .../apache/accumulo/tserver/TabletStatsKeeper.java |   6 +-
 .../org/apache/accumulo/tserver/WriteTracker.java  |  12 +-
 .../tserver/compaction/CompactionPlan.java         |  21 +-
 .../tserver/compaction/CompactionStrategy.java     |   6 +-
 .../compaction/DefaultCompactionStrategy.java      |  15 +-
 .../tserver/compaction/MajorCompactionRequest.java |   3 +-
 .../strategies/ConfigurableCompactionStrategy.java |   3 +-
 .../tserver/compactions/CompactionManager.java     |   3 +-
 .../tserver/compactions/CompactionService.java     |  14 +-
 .../compactions/ExternalCompactionExecutor.java    |   6 +-
 .../compactions/InternalCompactionExecutor.java    |   9 +-
 .../tserver/compactions/PrintableTable.java        |  11 +-
 .../org/apache/accumulo/tserver/log/DfsLogger.java |  60 +-
 .../org/apache/accumulo/tserver/log/LogSorter.java |   6 +-
 .../accumulo/tserver/log/RecoveryLogsIterator.java |   6 +-
 .../accumulo/tserver/log/SortedLogRecovery.java    |   6 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  17 +-
 .../apache/accumulo/tserver/logger/LogFileKey.java |   9 +-
 .../accumulo/tserver/logger/LogFileValue.java      |   3 +-
 .../apache/accumulo/tserver/logger/LogReader.java  |   6 +-
 .../tserver/memory/LargestFirstMemoryManager.java  |  15 +-
 .../tserver/metrics/TabletServerMetricsUtil.java   |   9 +-
 .../apache/accumulo/tserver/scan/LookupTask.java   |   9 +-
 .../accumulo/tserver/scan/NextBatchTask.java       |   9 +-
 .../accumulo/tserver/scan/ScanParameters.java      |   3 +-
 .../org/apache/accumulo/tserver/scan/ScanTask.java |  32 +-
 .../accumulo/tserver/session/MultiScanSession.java |   3 +-
 .../accumulo/tserver/session/SessionManager.java   |  24 +-
 .../tserver/session/SingleScanSession.java         |   8 +-
 .../accumulo/tserver/tablet/CommitSession.java     |  12 +-
 .../accumulo/tserver/tablet/CompactableImpl.java   |  69 ++-
 .../accumulo/tserver/tablet/CompactableUtils.java  |  12 +-
 .../accumulo/tserver/tablet/DatafileManager.java   |  34 +-
 .../tserver/tablet/MetadataUpdateCount.java        |   6 +-
 .../tserver/tablet/MinorCompactionTask.java        |   5 +-
 .../accumulo/tserver/tablet/MinorCompactor.java    |   3 +-
 .../accumulo/tserver/tablet/PreparedMutations.java |   3 +-
 .../org/apache/accumulo/tserver/tablet/Rate.java   |   6 +-
 .../accumulo/tserver/tablet/ScanDataSource.java    |  28 +-
 .../apache/accumulo/tserver/tablet/Scanner.java    |  31 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  11 +-
 .../apache/accumulo/tserver/tablet/TabletData.java |   3 +-
 .../accumulo/tserver/tablet/TabletMemory.java      |  11 +-
 .../compaction/DefaultCompactionStrategyTest.java  |  12 +-
 .../tserver/compaction/SizeWindowTest.java         |   5 +-
 .../tserver/log/RecoveryLogsIteratorTest.java      |   3 +-
 .../main/java/org/apache/accumulo/shell/Shell.java |  12 +-
 .../org/apache/accumulo/shell/ShellCompletor.java  |  43 +-
 .../java/org/apache/accumulo/shell/ShellUtil.java  |   6 +-
 .../main/java/org/apache/accumulo/shell/Token.java |  12 +-
 .../shell/commands/ActiveCompactionHelper.java     |  15 +-
 .../shell/commands/ActiveScanIterator.java         |   3 +-
 .../accumulo/shell/commands/ClearCommand.java      |   3 +-
 .../accumulo/shell/commands/CompactCommand.java    |   3 +-
 .../shell/commands/CreateTableCommand.java         |  21 +-
 .../shell/commands/DeleteNamespaceCommand.java     |   9 +-
 .../accumulo/shell/commands/FateCommand.java       |   3 +-
 .../accumulo/shell/commands/HelpCommand.java       |   3 +-
 .../accumulo/shell/commands/InsertCommand.java     |  13 +-
 .../accumulo/shell/commands/ListIterCommand.java   |   3 +-
 .../shell/commands/ListShellIterCommand.java       |  15 +-
 .../shell/commands/ListTabletsCommand.java         |  26 +-
 .../accumulo/shell/commands/MergeCommand.java      |   6 +-
 .../accumulo/shell/commands/NamespacesCommand.java |   8 +-
 .../accumulo/shell/commands/PasswdCommand.java     |   3 +-
 .../shell/commands/QuotedStringTokenizer.java      |   3 +-
 .../accumulo/shell/commands/ScanCommand.java       |   6 +-
 .../accumulo/shell/commands/SetIterCommand.java    |   6 +-
 .../shell/commands/SetScanIterCommand.java         |   3 +-
 .../accumulo/shell/commands/SummariesCommand.java  |   3 +-
 .../accumulo/shell/commands/TableOperation.java    |   9 +-
 .../accumulo/shell/commands/TablesCommand.java     |   8 +-
 .../shell/commands/ImportDirectoryCommandTest.java |   6 +-
 .../shell/commands/ListTabletsCommandTest.java     |   3 +-
 .../main/java/org/apache/accumulo/start/Main.java  |   3 +-
 .../java/org/apache/accumulo/start/TestMain.java   |   6 +-
 .../start/classloader/AccumuloClassLoader.java     |  28 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java       |  30 +-
 .../start/classloader/vfs/ContextManager.java      |  12 +-
 .../vfs/PostDelegatingVFSClassLoader.java          |   3 +-
 .../classloader/vfs/UniqueFileReplicator.java      |   9 +-
 .../accumulo/start/spi/KeywordExecutable.java      |   3 +-
 .../start/classloader/vfs/ContextManagerTest.java  |   5 +-
 .../apache/accumulo/harness/AccumuloITBase.java    |  11 +-
 .../accumulo/harness/MiniClusterHarness.java       |   3 +-
 .../accumulo/harness/SharedMiniClusterBase.java    |   3 +-
 .../org/apache/accumulo/harness/TestingKdc.java    |   9 +-
 .../org/apache/accumulo/test/AuditMessageIT.java   |   9 +-
 .../apache/accumulo/test/BatchWriterIterator.java  |  30 +-
 .../apache/accumulo/test/ChaoticLoadBalancer.java  |  15 +-
 .../java/org/apache/accumulo/test/CleanWalIT.java  |   3 +-
 .../java/org/apache/accumulo/test/CloneIT.java     |   3 +-
 .../org/apache/accumulo/test/CloseScannerIT.java   |   3 +-
 .../apache/accumulo/test/ConditionalWriterIT.java  |  31 +-
 .../accumulo/test/CountNameNodeOpsBulkIT.java      |   3 +-
 .../org/apache/accumulo/test/ExistingMacIT.java    |   6 +-
 .../org/apache/accumulo/test/InMemoryMapIT.java    |   9 +-
 .../org/apache/accumulo/test/IteratorEnvIT.java    |  27 +-
 .../test/ManagerRepairsDualAssignmentIT.java       |   3 +-
 .../org/apache/accumulo/test/NamespacesIT.java     |  27 +-
 .../org/apache/accumulo/test/ScanServerIT.java     |  45 +-
 .../accumulo/test/ScanServerMultipleScansIT.java   |   3 +-
 .../org/apache/accumulo/test/SplitRecoveryIT.java  |   3 +-
 .../apache/accumulo/test/TableOperationsIT.java    |   3 +-
 .../org/apache/accumulo/test/TestBinaryRows.java   |  12 +-
 .../apache/accumulo/test/TestMultiTableIngest.java |   9 +-
 .../apache/accumulo/test/TestRandomDeletes.java    |   6 +-
 .../accumulo/test/VerifySerialRecoveryIT.java      |   7 +-
 .../org/apache/accumulo/test/VolumeChooserIT.java  |   6 +-
 .../java/org/apache/accumulo/test/VolumeIT.java    |   6 +-
 .../org/apache/accumulo/test/WaitForBalanceIT.java |   3 +-
 .../test/compaction/CompactionExecutorIT.java      |   8 +-
 .../compaction/ExternalCompactionProgressIT.java   |   9 +-
 .../compaction/ExternalCompactionTestUtils.java    |   3 +-
 .../test/compaction/SizeCompactionStrategy.java    |  12 +-
 .../test/compaction/SplitCancelsMajCIT.java        |   3 +-
 .../test/compaction/TestCompactionStrategy.java    |  18 +-
 .../test/conf/store/PropStoreZooKeeperIT.java      |   3 +-
 .../test/constraints/AlphaNumKeyConstraint.java    |  12 +-
 .../accumulo/test/constraints/MaxMutationSize.java |   3 +-
 .../test/constraints/NumericValueConstraint.java   |   6 +-
 .../accumulo/test/functional/AuthsIterator.java    |   5 +-
 .../test/functional/BadIteratorMincIT.java         |   3 +-
 .../BalanceInPresenceOfOfflineTableIT.java         |   3 +-
 .../accumulo/test/functional/BatchScanSplitIT.java |   3 +-
 .../test/functional/BatchWriterFlushIT.java        |  12 +-
 .../apache/accumulo/test/functional/BulkOldIT.java |  15 +-
 .../accumulo/test/functional/CacheTestReader.java  |   9 +-
 .../accumulo/test/functional/CloneTestIT.java      |   3 +-
 .../accumulo/test/functional/ConcurrencyIT.java    |  12 +-
 .../test/functional/ConfigurableCompactionIT.java  |  12 +-
 .../accumulo/test/functional/CreateAndUseIT.java   |   3 +-
 .../test/functional/CreateInitialSplitsIT.java     |   3 +-
 .../accumulo/test/functional/DeleteRowsIT.java     |   3 +-
 .../test/functional/FateConcurrencyIT.java         |  24 +-
 .../test/functional/FunctionalTestUtils.java       |   6 +-
 .../test/functional/GarbageCollectorIT.java        |   3 +-
 .../accumulo/test/functional/ManagerApiIT.java     |   3 +-
 .../test/functional/ManyWriteAheadLogsIT.java      |   3 +-
 .../apache/accumulo/test/functional/MergeIT.java   |   3 +-
 .../accumulo/test/functional/MetadataIT.java       |   9 +-
 .../test/functional/MetadataMaxFilesIT.java        |   6 +-
 .../accumulo/test/functional/NativeMapIT.java      |  12 +-
 .../accumulo/test/functional/PerTableCryptoIT.java |  11 +-
 .../accumulo/test/functional/PermissionsIT.java    | 149 +++--
 .../test/functional/RecoveryWithEmptyRFileIT.java  |   3 +-
 .../apache/accumulo/test/functional/ScanIdIT.java  |  12 +-
 .../accumulo/test/functional/ScanRangeIT.java      |   3 +-
 .../test/functional/ScanSessionTimeOutIT.java      |   3 +-
 .../test/functional/SessionBlockVerifyIT.java      |   3 +-
 .../accumulo/test/functional/ShutdownIT.java       |   6 +-
 .../accumulo/test/functional/SlowIterator.java     |   6 +-
 .../apache/accumulo/test/functional/SplitIT.java   |   6 +-
 .../accumulo/test/functional/SplitRecoveryIT.java  |   3 +-
 .../functional/TabletStateChangeIteratorIT.java    |   3 +-
 .../apache/accumulo/test/functional/TimeoutIT.java |   3 +-
 .../accumulo/test/functional/VisibilityIT.java     |   3 +-
 .../accumulo/test/functional/WALSunnyDayIT.java    |   3 +-
 .../test/functional/WriteAheadLogEncryptedIT.java  |   5 +-
 .../accumulo/test/functional/ZooCacheIT.java       |   3 +-
 .../test/functional/ZookeeperRestartIT.java        |   3 +-
 .../apache/accumulo/test/manager/MergeStateIT.java |   3 +-
 .../accumulo/test/manager/SuspendedTabletsIT.java  |   3 +-
 .../test/performance/scan/CollectTabletStats.java  |   6 +-
 .../org/apache/accumulo/test/shell/MockShell.java  |  21 +-
 .../accumulo/test/shell/ShellCreateTableIT.java    |  28 +-
 .../apache/accumulo/test/shell/ShellServerIT.java  |  15 +-
 .../accumulo/test/util/SerializationUtil.java      |  36 +-
 .../accumulo/test/ChaoticLoadBalancerTest.java     |   6 +-
 768 files changed, 7854 insertions(+), 8082 deletions(-)


Reply via email to