This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


    from add1c4c  Merge branch '1.8'
     new fc20be3  POM updates for formatting (#416)
     new 19dc538  Merge commit 'fc20be34d6984114e7240c4eba276a3fe87a347b'
     new f4f43fe  Apply initial formatting changes to 100-char lines
     new e113e2f  Merge commit 'f4f43febbc3e68013d8a1bcd46d8b44275e2e55e'
     new 2387957  Fix findbugs error due to line-wrapping
     new 2ecae2d  Fix line wrap and other checkstyle errors
     new b8c19f8  Remove unused variables
     new ddfe3b9  Merge branch '1.8'
     new fbaee3e  Additional wrapping fixes for checkstyle (#416)

The 9 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 +-
 .../java/org/apache/accumulo/core/Constants.java   |    3 +-
 .../accumulo/core/bloomfilter/BloomFilter.java     |   36 +-
 .../core/bloomfilter/DynamicBloomFilter.java       |   49 +-
 .../apache/accumulo/core/bloomfilter/Filter.java   |    5 +-
 .../apache/accumulo/core/cli/BatchScannerOpts.java |    3 +-
 .../apache/accumulo/core/cli/BatchWriterOpts.java  |   12 +-
 .../org/apache/accumulo/core/cli/ClientOpts.java   |   46 +-
 .../core/cli/MapReduceClientOnRequiredTable.java   |    3 +-
 .../accumulo/core/cli/MapReduceClientOpts.java     |   13 +-
 .../org/apache/accumulo/core/cli/ScannerOpts.java  |    3 +-
 .../core/client/AccumuloSecurityException.java     |   15 +-
 .../apache/accumulo/core/client/BatchScanner.java  |   26 +-
 .../apache/accumulo/core/client/BatchWriter.java   |   15 +-
 .../accumulo/core/client/BatchWriterConfig.java    |   52 +-
 .../accumulo/core/client/ClientConfiguration.java  |   84 +-
 .../core/client/ClientSideIteratorScanner.java     |   56 +-
 .../accumulo/core/client/ConditionalWriter.java    |   30 +-
 .../core/client/ConditionalWriterConfig.java       |   25 +-
 .../org/apache/accumulo/core/client/Connector.java |  141 ++-
 .../apache/accumulo/core/client/Durability.java    |    6 +-
 .../org/apache/accumulo/core/client/Instance.java  |   28 +-
 .../accumulo/core/client/IsolatedScanner.java      |   16 +-
 .../accumulo/core/client/IteratorSetting.java      |   54 +-
 .../core/client/MultiTableBatchWriter.java         |    8 +-
 .../core/client/MutationsRejectedException.java    |   11 +-
 .../core/client/NamespaceExistsException.java      |   11 +-
 .../core/client/NamespaceNotEmptyException.java    |   11 +-
 .../core/client/NamespaceNotFoundException.java    |   11 +-
 .../apache/accumulo/core/client/RowIterator.java   |   11 +-
 .../core/client/SampleNotPresentException.java     |    3 +-
 .../org/apache/accumulo/core/client/Scanner.java   |   25 +-
 .../apache/accumulo/core/client/ScannerBase.java   |   93 +-
 .../core/client/TableDeletedException.java         |    3 +-
 .../accumulo/core/client/TableExistsException.java |    8 +-
 .../core/client/TableNotFoundException.java        |   14 +-
 .../accumulo/core/client/TimedOutException.java    |    3 +-
 .../accumulo/core/client/ZooKeeperInstance.java    |   74 +-
 .../core/client/admin/ActiveCompaction.java        |    3 +-
 .../core/client/admin/CompactionConfig.java        |   30 +-
 .../client/admin/CompactionStrategyConfig.java     |   14 +-
 .../core/client/admin/DelegationTokenConfig.java   |   10 +-
 .../apache/accumulo/core/client/admin/FindMax.java |   15 +-
 .../core/client/admin/InstanceOperations.java      |   35 +-
 .../accumulo/core/client/admin/Locations.java      |   12 +-
 .../core/client/admin/NamespaceOperations.java     |   82 +-
 .../core/client/admin/NewTableConfiguration.java   |   47 +-
 .../core/client/admin/ReplicationOperations.java   |   34 +-
 .../core/client/admin/SecurityOperations.java      |   76 +-
 .../core/client/admin/SummaryRetriever.java        |   40 +-
 .../core/client/admin/TableOperations.java         |  316 +++--
 .../accumulo/core/client/admin/TimeType.java       |    7 +-
 .../accumulo/core/client/impl/AbstractId.java      |    6 +-
 .../AcceptableThriftTableOperationException.java   |    6 +-
 .../core/client/impl/ActiveCompactionImpl.java     |    6 +-
 .../accumulo/core/client/impl/ActiveScanImpl.java  |    4 +-
 .../client/impl/AuthenticationTokenIdentifier.java |    3 +-
 .../core/client/impl/BaseIteratorEnvironment.java  |    8 +-
 .../core/client/impl/ClientConfConverter.java      |    9 +-
 .../accumulo/core/client/impl/ClientContext.java   |   86 +-
 .../core/client/impl/ConditionalWriterImpl.java    |   77 +-
 .../core/client/impl/ConnectionInfoFactory.java    |    3 +-
 .../accumulo/core/client/impl/ConnectorImpl.java   |   91 +-
 .../accumulo/core/client/impl/Credentials.java     |   67 +-
 .../core/client/impl/DelegationTokenImpl.java      |   21 +-
 .../core/client/impl/InstanceOperationsImpl.java   |   61 +-
 .../accumulo/core/client/impl/MasterClient.java    |   32 +-
 .../client/impl/MultiTableBatchWriterImpl.java     |   18 +-
 .../accumulo/core/client/impl/Namespace.java       |   13 +-
 .../client/impl/NamespaceOperationsHelper.java     |   80 +-
 .../core/client/impl/NamespaceOperationsImpl.java  |   78 +-
 .../accumulo/core/client/impl/Namespaces.java      |   33 +-
 .../accumulo/core/client/impl/OfflineIterator.java |   66 +-
 .../accumulo/core/client/impl/OfflineScanner.java  |    3 +-
 .../core/client/impl/ReplicationClient.java        |   44 +-
 .../client/impl/ReplicationOperationsImpl.java     |   32 +-
 .../core/client/impl/RootTabletLocator.java        |   27 +-
 .../accumulo/core/client/impl/ScannerImpl.java     |   13 +-
 .../accumulo/core/client/impl/ScannerIterator.java |   17 +-
 .../accumulo/core/client/impl/ScannerOptions.java  |    3 +-
 .../core/client/impl/SecurityOperationsImpl.java   |  126 +-
 .../accumulo/core/client/impl/ServerClient.java    |   52 +-
 .../core/client/impl/SyncingTabletLocator.java     |   17 +-
 .../apache/accumulo/core/client/impl/Table.java    |   11 +-
 .../apache/accumulo/core/client/impl/TableMap.java |    3 +-
 .../core/client/impl/TableOperationsHelper.java    |   80 +-
 .../core/client/impl/TableOperationsImpl.java      |  470 +++++---
 .../apache/accumulo/core/client/impl/Tables.java   |   65 +-
 .../accumulo/core/client/impl/TabletLocator.java   |   28 +-
 .../core/client/impl/TabletLocatorImpl.java        |  141 ++-
 .../core/client/impl/TabletServerBatchDeleter.java |    9 +-
 .../core/client/impl/TabletServerBatchReader.java  |   15 +-
 .../impl/TabletServerBatchReaderIterator.java      |  142 ++-
 .../core/client/impl/TabletServerBatchWriter.java  |  142 ++-
 .../accumulo/core/client/impl/TabletType.java      |    3 +-
 .../accumulo/core/client/impl/ThriftScanner.java   |  129 +-
 .../core/client/impl/ThriftTransportKey.java       |    6 +-
 .../core/client/impl/ThriftTransportPool.java      |   45 +-
 .../core/client/impl/TimeoutTabletLocator.java     |   15 +-
 .../accumulo/core/client/impl/Translator.java      |   15 +-
 .../apache/accumulo/core/client/impl/Writer.java   |   12 +-
 .../core/client/lexicoder/AbstractEncoder.java     |   14 +-
 .../core/client/lexicoder/BigIntegerLexicoder.java |    6 +-
 .../core/client/lexicoder/BytesLexicoder.java      |   10 +-
 .../core/client/lexicoder/DateLexicoder.java       |    3 +-
 .../core/client/lexicoder/DoubleLexicoder.java     |    3 +-
 .../accumulo/core/client/lexicoder/Encoder.java    |    3 +-
 .../core/client/lexicoder/FloatLexicoder.java      |    3 +-
 .../core/client/lexicoder/IntegerLexicoder.java    |    7 +-
 .../accumulo/core/client/lexicoder/Lexicoder.java  |    4 +-
 .../core/client/lexicoder/ListLexicoder.java       |    6 +-
 .../core/client/lexicoder/LongLexicoder.java       |    4 +-
 .../core/client/lexicoder/PairLexicoder.java       |   44 +-
 .../core/client/lexicoder/ReverseLexicoder.java    |    7 +-
 .../core/client/lexicoder/StringLexicoder.java     |    7 +-
 .../core/client/lexicoder/TextLexicoder.java       |    7 +-
 .../core/client/lexicoder/UIntegerLexicoder.java   |    8 +-
 .../core/client/lexicoder/ULongLexicoder.java      |    8 +-
 .../core/client/lexicoder/UUIDLexicoder.java       |    7 +-
 .../lexicoder/impl/FixedByteArrayOutputStream.java |    3 +-
 .../core/client/mapred/AbstractInputFormat.java    |  130 ++-
 .../client/mapred/AccumuloFileOutputFormat.java    |   53 +-
 .../core/client/mapred/AccumuloInputFormat.java    |   15 +-
 .../mapred/AccumuloMultiTableInputFormat.java      |   11 +-
 .../core/client/mapred/AccumuloOutputFormat.java   |   82 +-
 .../core/client/mapred/AccumuloRowInputFormat.java |   66 +-
 .../core/client/mapred/InputFormatBase.java        |   94 +-
 .../core/client/mapred/RangeInputSplit.java        |    3 +-
 .../core/client/mapred/impl/BatchInputSplit.java   |    9 +-
 .../core/client/mapreduce/AbstractInputFormat.java |  144 ++-
 .../client/mapreduce/AccumuloFileOutputFormat.java |   47 +-
 .../core/client/mapreduce/AccumuloInputFormat.java |   15 +-
 .../mapreduce/AccumuloMultiTableInputFormat.java   |   11 +-
 .../client/mapreduce/AccumuloOutputFormat.java     |   88 +-
 .../client/mapreduce/AccumuloRowInputFormat.java   |   13 +-
 .../core/client/mapreduce/InputFormatBase.java     |   97 +-
 .../core/client/mapreduce/InputTableConfig.java    |   58 +-
 .../core/client/mapreduce/RangeInputSplit.java     |   21 +-
 .../client/mapreduce/impl/BatchInputSplit.java     |   30 +-
 .../client/mapreduce/impl/DelegationTokenStub.java |    3 +-
 .../core/client/mapreduce/impl/SplitUtils.java     |   16 +-
 .../mapreduce/lib/impl/ConfiguratorBase.java       |  136 ++-
 .../mapreduce/lib/impl/FileOutputConfigurator.java |   86 +-
 .../mapreduce/lib/impl/InputConfigurator.java      |  231 ++--
 .../mapreduce/lib/impl/OutputConfigurator.java     |   36 +-
 .../client/mapreduce/lib/impl/package-info.java    |   27 +-
 .../lib/partition/KeyRangePartitioner.java         |    3 +-
 .../mapreduce/lib/partition/RangePartitioner.java  |    9 +-
 .../accumulo/core/client/mock/MockAccumulo.java    |   15 +-
 .../core/client/mock/MockBatchDeleter.java         |    9 +-
 .../accumulo/core/client/mock/MockConnector.java   |   49 +-
 .../accumulo/core/client/mock/MockInstance.java    |   25 +-
 .../core/client/mock/MockInstanceOperations.java   |   18 +-
 .../client/mock/MockMultiTableBatchWriter.java     |    3 +-
 .../core/client/mock/MockNamespaceOperations.java  |   25 +-
 .../accumulo/core/client/mock/MockScannerBase.java |   14 +-
 .../core/client/mock/MockSecurityOperations.java   |   54 +-
 .../accumulo/core/client/mock/MockTable.java       |   14 +-
 .../core/client/mock/MockTableOperations.java      |  160 ++-
 .../core/client/mock/impl/MockTabletLocator.java   |   12 +-
 .../accumulo/core/client/mock/package-info.java    |    1 -
 .../client/replication/PeerExistsException.java    |    3 +-
 .../apache/accumulo/core/client/rfile/RFile.java   |  129 +-
 .../accumulo/core/client/rfile/RFileScanner.java   |   35 +-
 .../core/client/rfile/RFileScannerBuilder.java     |    6 +-
 .../accumulo/core/client/rfile/RFileSource.java    |    4 +-
 .../core/client/rfile/RFileSummariesRetriever.java |    6 +-
 .../accumulo/core/client/rfile/RFileWriter.java    |   56 +-
 .../core/client/rfile/RFileWriterBuilder.java      |   19 +-
 .../core/client/sample/AbstractHashSampler.java    |   13 +-
 .../core/client/sample/RowColumnSampler.java       |   23 +-
 .../accumulo/core/client/sample/RowSampler.java    |   18 +-
 .../accumulo/core/client/sample/Sampler.java       |   30 +-
 .../security/tokens/AuthenticationToken.java       |   26 +-
 .../security/tokens/CredentialProviderToken.java   |   24 +-
 .../client/security/tokens/DelegationToken.java    |   13 +-
 .../core/client/security/tokens/KerberosToken.java |   28 +-
 .../core/client/security/tokens/PasswordToken.java |   21 +-
 .../core/client/summary/CounterSummary.java        |   24 +-
 .../core/client/summary/CountingSummarizer.java    |  111 +-
 .../accumulo/core/client/summary/Summarizer.java   |   75 +-
 .../client/summary/SummarizerConfiguration.java    |   36 +-
 .../accumulo/core/client/summary/Summary.java      |   55 +-
 .../summary/summarizers/DeletesSummarizer.java     |    8 +-
 .../summary/summarizers/EntryLengthSummarizer.java |   22 +-
 .../summary/summarizers/FamilySummarizer.java      |    8 +-
 .../summary/summarizers/VisibilitySummarizer.java  |    8 +-
 .../accumulo/core/conf/AccumuloConfiguration.java  |   45 +-
 .../accumulo/core/conf/CliConfiguration.java       |    3 +-
 .../accumulo/core/conf/ClientConfigGenerate.java   |   30 +-
 .../apache/accumulo/core/conf/ClientProperty.java  |   50 +-
 .../accumulo/core/conf/ConfigSanityCheck.java      |   61 +-
 .../accumulo/core/conf/ConfigurationCopy.java      |    3 +-
 .../accumulo/core/conf/ConfigurationDocGen.java    |   34 +-
 .../core/conf/ConfigurationTypeHelper.java         |   46 +-
 .../core/conf/CredentialProviderFactoryShim.java   |  120 +-
 .../accumulo/core/conf/DefaultConfiguration.java   |    9 +-
 .../apache/accumulo/core/conf/Interpolated.java    |    9 +-
 .../core/conf/ObservableConfiguration.java         |    6 +-
 .../org/apache/accumulo/core/conf/Property.java    | 1234 +++++++++++++-------
 .../apache/accumulo/core/conf/PropertyType.java    |  133 ++-
 .../org/apache/accumulo/core/conf/Sensitive.java   |    3 +-
 .../accumulo/core/conf/SiteConfiguration.java      |   50 +-
 .../accumulo/core/constraints/Constraint.java      |   14 +-
 .../core/constraints/VisibilityConstraint.java     |    3 +-
 .../accumulo/core/data/ArrayByteSequence.java      |   24 +-
 .../apache/accumulo/core/data/ByteSequence.java    |   17 +-
 .../java/org/apache/accumulo/core/data/Column.java |   10 +-
 .../apache/accumulo/core/data/ColumnUpdate.java    |   20 +-
 .../org/apache/accumulo/core/data/Condition.java   |   55 +-
 .../accumulo/core/data/ConditionalMutation.java    |    6 +-
 .../core/data/ConstraintViolationSummary.java      |   13 +-
 .../java/org/apache/accumulo/core/data/Key.java    |  322 +++--
 .../org/apache/accumulo/core/data/KeyBuilder.java  |   47 +-
 .../org/apache/accumulo/core/data/Mutation.java    |  237 ++--
 .../org/apache/accumulo/core/data/PartialKey.java  |    6 +-
 .../java/org/apache/accumulo/core/data/Range.java  |  180 ++-
 .../org/apache/accumulo/core/data/TabletId.java    |    3 +-
 .../java/org/apache/accumulo/core/data/Value.java  |   32 +-
 .../accumulo/core/data/impl/ComparableBytes.java   |    3 +-
 .../apache/accumulo/core/data/impl/KeyExtent.java  |   82 +-
 .../accumulo/core/file/BloomFilterLayer.java       |   71 +-
 .../accumulo/core/file/DispatchingFileFactory.java |   14 +-
 .../apache/accumulo/core/file/FileOperations.java  |  139 ++-
 .../accumulo/core/file/blockfile/ABlockReader.java |    3 +-
 .../core/file/blockfile/BlockFileReader.java       |    3 +-
 .../core/file/blockfile/BlockFileWriter.java       |    3 +-
 .../core/file/blockfile/cache/BlockCache.java      |   13 +-
 .../file/blockfile/cache/BlockCacheManager.java    |   39 +-
 .../core/file/blockfile/cache/CacheEntry.java      |    7 +-
 .../cache/impl/BlockCacheConfiguration.java        |    3 +-
 .../cache/impl/BlockCacheManagerFactory.java       |   21 +-
 .../core/file/blockfile/cache/impl/ClassSize.java  |   18 +-
 .../core/file/blockfile/cache/lru/CachedBlock.java |   16 +-
 .../file/blockfile/cache/lru/CachedBlockQueue.java |   15 +-
 .../core/file/blockfile/cache/lru/HeapSize.java    |    9 +-
 .../file/blockfile/cache/lru/LruBlockCache.java    |  113 +-
 .../cache/lru/LruBlockCacheConfiguration.java      |   32 +-
 .../cache/lru/SynchronousLoadingBlockCache.java    |    3 +-
 .../blockfile/cache/tinylfu/TinyLfuBlockCache.java |   29 +-
 .../file/blockfile/impl/CachableBlockFile.java     |   96 +-
 .../impl/SeekableByteArrayInputStream.java         |    9 +-
 .../file/keyfunctor/ColumnQualifierFunctor.java    |    3 +-
 .../accumulo/core/file/keyfunctor/RowFunctor.java  |    3 +-
 .../accumulo/core/file/map/MapFileOperations.java  |   19 +-
 .../apache/accumulo/core/file/map/MapFileUtil.java |    6 +-
 .../accumulo/core/file/rfile/BlockIndex.java       |   21 +-
 .../accumulo/core/file/rfile/CreateEmpty.java      |   23 +-
 .../accumulo/core/file/rfile/IndexIterator.java    |    6 +-
 .../accumulo/core/file/rfile/KeyShortener.java     |   27 +-
 .../accumulo/core/file/rfile/MetricsGatherer.java  |   10 +-
 .../core/file/rfile/MultiIndexIterator.java        |    6 +-
 .../accumulo/core/file/rfile/MultiLevelIndex.java  |   58 +-
 .../apache/accumulo/core/file/rfile/PrintInfo.java |   28 +-
 .../org/apache/accumulo/core/file/rfile/RFile.java |  232 ++--
 .../accumulo/core/file/rfile/RFileOperations.java  |   22 +-
 .../accumulo/core/file/rfile/RelativeKey.java      |   33 +-
 .../accumulo/core/file/rfile/RollingStats.java     |   15 +-
 .../accumulo/core/file/rfile/SplitLarge.java       |   15 +-
 .../core/file/rfile/VisMetricsGatherer.java        |   19 +-
 .../accumulo/core/file/rfile/VisibilityMetric.java |   10 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java    |  188 +--
 .../core/file/rfile/bcfile/Compression.java        |  134 ++-
 .../accumulo/core/file/rfile/bcfile/PrintInfo.java |   15 +-
 .../core/file/rfile/bcfile/RawComparable.java      |   10 +-
 .../rfile/bcfile/SimpleBufferedOutputStream.java   |    3 +-
 .../accumulo/core/file/rfile/bcfile/Utils.java     |   67 +-
 .../file/streams/BoundedRangeFileInputStream.java  |   11 +-
 .../file/streams/PositionedDataOutputStream.java   |    6 +-
 .../core/file/streams/PositionedOutput.java        |    3 +-
 .../core/file/streams/PositionedOutputs.java       |    8 +-
 .../core/file/streams/RateLimitedInputStream.java  |    3 +-
 .../core/file/streams/SeekableDataInputStream.java |    3 +-
 .../core/iterators/AggregatingIterator.java        |   35 +-
 .../core/iterators/ColumnFamilyCounter.java        |    9 +-
 .../apache/accumulo/core/iterators/Combiner.java   |  134 ++-
 .../accumulo/core/iterators/DebugIterator.java     |   10 +-
 .../apache/accumulo/core/iterators/DevNull.java    |   10 +-
 .../core/iterators/FamilyIntersectingIterator.java |    3 +-
 .../org/apache/accumulo/core/iterators/Filter.java |   25 +-
 .../core/iterators/FirstEntryInRowIterator.java    |   16 +-
 .../core/iterators/IntersectingIterator.java       |    6 +-
 .../accumulo/core/iterators/IteratorAdapter.java   |    3 +-
 .../core/iterators/IteratorEnvironment.java        |   17 +-
 .../accumulo/core/iterators/IteratorUtil.java      |  164 ++-
 .../accumulo/core/iterators/LongCombiner.java      |   61 +-
 .../accumulo/core/iterators/OptionDescriber.java   |   39 +-
 .../apache/accumulo/core/iterators/OrIterator.java |   52 +-
 .../core/iterators/RowDeletingIterator.java        |    6 +-
 .../accumulo/core/iterators/ServerFilter.java      |   15 +-
 .../core/iterators/ServerSkippingIterator.java     |   10 +-
 .../core/iterators/ServerWrappingIterator.java     |   17 +-
 .../accumulo/core/iterators/SkippingIterator.java  |   10 +-
 .../accumulo/core/iterators/SortedKeyIterator.java |    4 +-
 .../core/iterators/SortedKeyValueIterator.java     |   89 +-
 .../accumulo/core/iterators/SortedMapIterator.java |   13 +-
 .../core/iterators/SynchronizedServerFilter.java   |   12 +-
 .../core/iterators/TypedValueCombiner.java         |   38 +-
 .../core/iterators/VersioningIterator.java         |    3 +-
 .../accumulo/core/iterators/WholeRowIterator.java  |    3 +-
 .../accumulo/core/iterators/WrappingIterator.java  |   22 +-
 .../accumulo/core/iterators/YieldCallback.java     |    5 +-
 .../core/iterators/YieldingKeyValueIterator.java   |   12 +-
 .../core/iterators/aggregation/LongSummation.java  |   15 +-
 .../iterators/aggregation/NumArraySummation.java   |    3 +-
 .../core/iterators/aggregation/NumSummation.java   |    3 +-
 .../core/iterators/aggregation/StringMax.java      |    4 +-
 .../core/iterators/aggregation/StringMin.java      |    4 +-
 .../iterators/aggregation/StringSummation.java     |    3 +-
 .../aggregation/conf/AggregatorConfiguration.java  |    3 +-
 .../iterators/aggregation/conf/AggregatorSet.java  |    6 +-
 .../accumulo/core/iterators/conf/ColumnSet.java    |    6 +-
 .../core/iterators/conf/ColumnToClassMapping.java  |   12 +-
 .../accumulo/core/iterators/conf/ColumnUtil.java   |    9 +-
 .../iterators/conf/PerColumnIteratorConfig.java    |    6 +-
 .../system/ColumnFamilySkippingIterator.java       |   12 +-
 .../iterators/system/ColumnQualifierFilter.java    |    6 +-
 .../core/iterators/system/CountingIterator.java    |    3 +-
 .../core/iterators/system/DeletingIterator.java    |   15 +-
 .../core/iterators/system/EmptyIterator.java       |    6 +-
 .../core/iterators/system/HeapIterator.java        |    4 +-
 .../iterators/system/LocalityGroupIterator.java    |   43 +-
 .../core/iterators/system/MapFileIterator.java     |    9 +-
 .../core/iterators/system/MultiIterator.java       |    9 +-
 .../iterators/system/SequenceFileIterator.java     |    6 +-
 .../iterators/system/SourceSwitchingIterator.java  |   50 +-
 .../core/iterators/system/StatsIterator.java       |    6 +-
 .../iterators/system/SynchronizedIterator.java     |   14 +-
 .../core/iterators/system/TimeSettingIterator.java |    6 +-
 .../core/iterators/system/VisibilityFilter.java    |   16 +-
 .../accumulo/core/iterators/user/AgeOffFilter.java |   18 +-
 .../core/iterators/user/BigDecimalCombiner.java    |   12 +-
 .../core/iterators/user/CfCqSliceFilter.java       |   13 +-
 .../core/iterators/user/CfCqSliceOpts.java         |   50 +-
 .../iterators/user/CfCqSliceSeekingFilter.java     |   27 +-
 .../core/iterators/user/ColumnAgeOffFilter.java    |   17 +-
 .../core/iterators/user/ColumnSliceFilter.java     |   22 +-
 .../accumulo/core/iterators/user/GrepIterator.java |    9 +-
 .../core/iterators/user/IndexedDocIterator.java    |   35 +-
 .../core/iterators/user/IntersectingIterator.java  |  100 +-
 .../core/iterators/user/LargeRowFilter.java        |   49 +-
 .../accumulo/core/iterators/user/MaxCombiner.java  |    4 +-
 .../accumulo/core/iterators/user/MinCombiner.java  |    4 +-
 .../accumulo/core/iterators/user/RegExFilter.java  |   26 +-
 .../core/iterators/user/RowDeletingIterator.java   |   45 +-
 .../core/iterators/user/RowEncodingIterator.java   |   64 +-
 .../accumulo/core/iterators/user/RowFilter.java    |   44 +-
 .../core/iterators/user/SeekingFilter.java         |   47 +-
 .../core/iterators/user/SummingArrayCombiner.java  |   26 +-
 .../core/iterators/user/SummingCombiner.java       |    4 +-
 .../core/iterators/user/TimestampFilter.java       |   15 +-
 .../core/iterators/user/TransformingIterator.java  |  234 ++--
 .../core/iterators/user/VersioningIterator.java    |   19 +-
 .../core/iterators/user/VisibilityFilter.java      |   16 +-
 .../iterators/user/WholeColumnFamilyIterator.java  |   52 +-
 .../core/iterators/user/WholeRowIterator.java      |   27 +-
 .../core/metadata/MetadataLocationObtainer.java    |   54 +-
 .../accumulo/core/metadata/MetadataServicer.java   |    9 +-
 .../apache/accumulo/core/metadata/RootTable.java   |    3 +-
 .../core/metadata/ServicerForRootTable.java        |    3 +-
 .../core/metadata/TableMetadataServicer.java       |   26 +-
 .../core/metadata/schema/MetadataScanner.java      |   12 +-
 .../core/metadata/schema/MetadataSchema.java       |   50 +-
 .../core/metadata/schema/TabletMetadata.java       |   36 +-
 .../replication/AccumuloReplicationReplayer.java   |    7 +-
 .../core/replication/ReplicationSchema.java        |   53 +-
 .../core/replication/ReplicationTable.java         |    9 +-
 .../core/replication/ReplicationTarget.java        |   10 +-
 .../apache/accumulo/core/rpc/FilterTransport.java  |    5 +-
 .../rpc/ProtocolOverridingSSLSocketFactory.java    |   24 +-
 .../core/rpc/SaslClientDigestCallbackHandler.java  |    5 +-
 .../accumulo/core/rpc/SaslConnectionParams.java    |   15 +-
 .../core/rpc/SaslDigestCallbackHandler.java        |    6 +-
 .../accumulo/core/rpc/SslConnectionParams.java     |   19 +-
 .../apache/accumulo/core/rpc/TBufferedSocket.java  |    3 +-
 .../accumulo/core/rpc/TServiceClientWrapper.java   |    5 +-
 .../accumulo/core/rpc/TTimeoutTransport.java       |   21 +-
 .../org/apache/accumulo/core/rpc/ThriftUtil.java   |  144 ++-
 .../accumulo/core/rpc/TraceProtocolFactory.java    |    3 +-
 .../accumulo/core/rpc/UGIAssumingTransport.java    |    8 +-
 .../core/sample/impl/SamplerConfigurationImpl.java |    9 +-
 .../accumulo/core/sample/impl/SamplerFactory.java  |   12 +-
 .../accumulo/core/security/Authorizations.java     |   24 +-
 .../accumulo/core/security/ColumnVisibility.java   |   91 +-
 .../core/security/NamespacePermission.java         |    3 +-
 .../accumulo/core/security/SystemPermission.java   |    3 +-
 .../accumulo/core/security/TablePermission.java    |    3 +-
 .../core/security/VisibilityEvaluator.java         |   29 +-
 .../core/security/VisibilityParseException.java    |    3 +-
 .../core/security/crypto/BlockedInputStream.java   |   10 +-
 .../core/security/crypto/BlockedOutputStream.java  |   19 +-
 .../CachingHDFSSecretKeyEncryptionStrategy.java    |   45 +-
 .../core/security/crypto/CryptoModule.java         |   90 +-
 .../core/security/crypto/CryptoModuleFactory.java  |   72 +-
 .../security/crypto/CryptoModuleParameters.java    |  255 ++--
 .../core/security/crypto/DefaultCryptoModule.java  |  177 ++-
 .../security/crypto/DefaultCryptoModuleUtils.java  |   18 +-
 .../NonCachingSecretKeyEncryptionStrategy.java     |   38 +-
 .../security/crypto/RFileCipherOutputStream.java   |   25 +-
 .../org/apache/accumulo/core/summary/Gatherer.java |  117 +-
 .../core/summary/SummarizerConfigurationUtil.java  |    6 +-
 .../accumulo/core/summary/SummarizerFactory.java   |    9 +-
 .../accumulo/core/summary/SummaryCollection.java   |   12 +-
 .../accumulo/core/summary/SummaryReader.java       |   45 +-
 .../accumulo/core/summary/SummarySerializer.java   |   39 +-
 .../accumulo/core/summary/SummaryWriter.java       |   21 +-
 .../apache/accumulo/core/trace/CountSampler.java   |    3 +-
 .../accumulo/core/trace/DistributedTrace.java      |   39 +-
 .../accumulo/core/trace/ProbabilitySampler.java    |    3 +-
 .../java/org/apache/accumulo/core/trace/Span.java  |    3 +-
 .../java/org/apache/accumulo/core/trace/Trace.java |    3 +-
 .../accumulo/core/trace/wrappers/TraceWrap.java    |   11 +-
 .../org/apache/accumulo/core/util/AddressUtil.java |    6 +-
 .../apache/accumulo/core/util/ByteBufferUtil.java  |   12 +-
 .../accumulo/core/util/CancelFlagFuture.java       |    6 +-
 .../org/apache/accumulo/core/util/Classpath.java   |    3 +-
 .../org/apache/accumulo/core/util/CleanUp.java     |   11 +-
 .../apache/accumulo/core/util/ComparablePair.java  |    3 +-
 .../accumulo/core/util/CompletableFutureUtil.java  |    6 +-
 .../org/apache/accumulo/core/util/CreateToken.java |   24 +-
 .../apache/accumulo/core/util/DeprecationUtil.java |   13 +-
 .../org/apache/accumulo/core/util/FastFormat.java  |    6 +-
 .../org/apache/accumulo/core/util/HostAndPort.java |   46 +-
 .../accumulo/core/util/LocalityGroupUtil.java      |   41 +-
 .../java/org/apache/accumulo/core/util/Merge.java  |   34 +-
 .../org/apache/accumulo/core/util/OpTimer.java     |   14 +-
 .../apache/accumulo/core/util/PeekingIterator.java |    3 +-
 .../accumulo/core/util/PreAllocatedArray.java      |    5 +-
 .../apache/accumulo/core/util/ServerServices.java  |    3 +-
 .../accumulo/core/util/SimpleThreadPool.java       |    3 +-
 .../accumulo/core/util/ThriftMessageUtil.java      |   13 +-
 .../accumulo/core/util/UnsynchronizedBuffer.java   |   26 +-
 .../org/apache/accumulo/core/util/Validator.java   |   15 +-
 .../accumulo/core/util/format/BinaryFormatter.java |   12 +-
 .../core/util/format/DateFormatSupplier.java       |   19 +-
 .../core/util/format/DateStringFormatter.java      |   17 +-
 .../core/util/format/DefaultFormatter.java         |    9 +-
 .../accumulo/core/util/format/FormatterConfig.java |    5 +-
 .../core/util/format/FormatterFactory.java         |    6 +-
 .../accumulo/core/util/format/HexFormatter.java    |    3 +-
 .../format/ShardedTableDistributionFormatter.java  |    7 +-
 .../util/format/StatisticsDisplayFormatter.java    |    5 +-
 .../core/util/interpret/HexScanInterpreter.java    |    5 +-
 .../core/util/interpret/ScanInterpreter.java       |    3 +-
 .../core/util/ratelimit/GuavaRateLimiter.java      |    9 +-
 .../util/ratelimit/SharedRateLimiterFactory.java   |   22 +-
 .../accumulo/core/volume/NonConfiguredVolume.java  |   21 +-
 .../org/apache/accumulo/core/volume/Volume.java    |    6 +-
 .../accumulo/core/volume/VolumeConfiguration.java  |   21 +-
 .../apache/accumulo/core/volume/VolumeImpl.java    |   12 +-
 .../apache/accumulo/core/zookeeper/ZooUtil.java    |   16 +-
 .../core/client/BatchWriterConfigTest.java         |    6 +-
 .../core/client/ClientConfigurationTest.java       |    9 +-
 .../accumulo/core/client/IteratorSettingTest.java  |    6 +-
 .../core/client/ZooKeeperInstanceTest.java         |   21 +-
 .../client/admin/DelegationTokenConfigTest.java    |    6 +-
 .../core/client/impl/ClientContextTest.java        |   15 +-
 .../accumulo/core/client/impl/NamespaceTest.java   |    3 +-
 .../core/client/impl/ScannerOptionsTest.java       |    3 +-
 .../client/impl/TableOperationsHelperTest.java     |  157 ++-
 .../core/client/impl/TableOperationsImplTest.java  |    3 +-
 .../accumulo/core/client/impl/TableTest.java       |    3 +-
 .../core/client/impl/TabletLocatorImplTest.java    |  264 +++--
 .../core/client/impl/ThriftScannerTest.java        |    6 +-
 .../core/client/impl/ThriftTransportKeyTest.java   |   89 +-
 .../client/lexicoder/BigIntegerLexicoderTest.java  |   19 +-
 .../core/client/lexicoder/DoubleLexicoderTest.java |   10 +-
 .../core/client/lexicoder/FloatLexicoderTest.java  |    9 +-
 .../client/lexicoder/IntegerLexicoderTest.java     |    4 +-
 .../core/client/lexicoder/LexicoderTest.java       |    3 +-
 .../core/client/lexicoder/LongLexicoderTest.java   |    8 +-
 .../core/client/lexicoder/PairLexicoderTest.java   |   21 +-
 .../client/lexicoder/ReverseLexicoderTest.java     |   11 +-
 .../core/client/lexicoder/ULongLexicoderTest.java  |   31 +-
 .../core/client/lexicoder/UUIDLexicoderTest.java   |    4 +-
 .../lexicoder/impl/AbstractLexicoderTest.java      |    5 +-
 .../mapred/AccumuloFileOutputFormatTest.java       |   18 +-
 .../client/mapred/AccumuloInputFormatTest.java     |   38 +-
 .../mapred/AccumuloMultiTableInputFormatTest.java  |    9 +-
 .../client/mapred/AccumuloOutputFormatTest.java    |    6 +-
 .../core/client/mapred/RangeInputSplitTest.java    |    9 +-
 .../mapreduce/AccumuloFileOutputFormatTest.java    |   21 +-
 .../client/mapreduce/AccumuloInputFormatTest.java  |   38 +-
 .../AccumuloMultiTableInputFormatTest.java         |    3 +-
 .../client/mapreduce/AccumuloOutputFormatTest.java |    6 +-
 .../core/client/mapreduce/RangeInputSplitTest.java |    9 +-
 .../client/mapreduce/impl/BatchInputSplitTest.java |    9 +-
 .../mapreduce/lib/impl/ConfiguratorBaseTest.java   |   42 +-
 .../lib/partition/RangePartitionerTest.java        |    9 +-
 .../core/client/mock/MockConnectorTest.java        |   26 +-
 .../core/client/mock/MockNamespacesTest.java       |   25 +-
 .../accumulo/core/client/mock/MockScannerTest.java |    6 +-
 .../core/client/mock/MockTableOperationsTest.java  |   34 +-
 .../core/client/mock/TestBatchScanner821.java      |    3 +-
 .../accumulo/core/client/rfile/RFileTest.java      |  134 ++-
 .../client/security/SecurityErrorCodeTest.java     |    6 +-
 .../security/tokens/DelegationTokenImplTest.java   |   21 +-
 .../client/security/tokens/KerberosTokenTest.java  |    3 +-
 .../client/summary/CountingSummarizerTest.java     |   13 +-
 .../summarizers/EntryLengthSummarizersTest.java    |   91 +-
 .../core/conf/AccumuloConfigurationTest.java       |    6 +-
 .../accumulo/core/conf/ConfigSanityCheckTest.java  |   36 +-
 .../core/conf/ConfigurationTypeHelperTest.java     |   10 +-
 .../conf/CredentialProviderFactoryShimTest.java    |   38 +-
 .../core/conf/DefaultConfigurationTest.java        |    3 +-
 .../apache/accumulo/core/conf/PropertyTest.java    |   35 +-
 .../accumulo/core/conf/PropertyTypeTest.java       |   38 +-
 .../accumulo/core/conf/SiteConfigurationTest.java  |   15 +-
 .../constraints/DefaultKeySizeConstraintTest.java  |   16 +-
 .../accumulo/core/data/ArrayByteSequenceTest.java  |    3 +-
 .../apache/accumulo/core/data/ConditionTest.java   |   12 +-
 .../core/data/ConstraintViolationSummaryTest.java  |   13 +-
 .../apache/accumulo/core/data/KeyBuilderTest.java  |   47 +-
 .../apache/accumulo/core/data/KeyExtentTest.java   |    3 +-
 .../org/apache/accumulo/core/data/KeyTest.java     |   12 +-
 .../apache/accumulo/core/data/MutationTest.java    |   41 +-
 .../org/apache/accumulo/core/data/OldMutation.java |   84 +-
 .../org/apache/accumulo/core/data/RangeTest.java   |  123 +-
 .../core/file/BloomFilterLayerLookupTest.java      |   12 +-
 .../accumulo/core/file/FileOperationsTest.java     |    3 +-
 .../blockfile/cache/BlockCacheManagerTest.java     |   12 +-
 .../file/blockfile/cache/TestCachedBlockQueue.java |   16 +-
 .../file/blockfile/cache/TestLruBlockCache.java    |   63 +-
 .../accumulo/core/file/rfile/BlockIndexTest.java   |   15 +-
 .../core/file/rfile/CreateCompatTestFile.java      |   22 +-
 .../accumulo/core/file/rfile/KeyShortenerTest.java |   78 +-
 .../core/file/rfile/MultiLevelIndexTest.java       |    6 +-
 .../core/file/rfile/MultiThreadedRFileTest.java    |   56 +-
 .../accumulo/core/file/rfile/RFileMetricsTest.java |    9 +-
 .../apache/accumulo/core/file/rfile/RFileTest.java |  295 +++--
 .../accumulo/core/file/rfile/RelativeKeyTest.java  |   24 +-
 .../core/file/rfile/RolllingStatsTest.java         |    4 +-
 .../core/file/rfile/bcfile/CompressionTest.java    |   21 +-
 .../file/streams/RateLimitedInputStreamTest.java   |   12 +-
 .../file/streams/RateLimitedOutputStreamTest.java  |    3 +-
 .../core/iterators/AggregatingIteratorTest.java    |    9 +-
 .../core/iterators/DefaultIteratorEnvironment.java |    3 +-
 .../iterators/FirstEntryInRowIteratorTest.java     |   15 +-
 .../core/iterators/FirstEntryInRowTest.java        |    9 +-
 .../accumulo/core/iterators/IteratorUtilTest.java  |   74 +-
 .../conf/AggregatorConfigurationTest.java          |   21 +-
 .../system/ColumnFamilySkippingIteratorTest.java   |   16 +-
 .../core/iterators/system/ColumnFilterTest.java    |    6 +-
 .../iterators/system/DeletingIteratorTest.java     |    3 +-
 .../core/iterators/system/MultiIteratorTest.java   |   20 +-
 .../system/SourceSwitchingIteratorTest.java        |   28 +-
 .../iterators/system/TimeSettingIteratorTest.java  |   21 +-
 .../iterators/system/VisibilityFilterTest.java     |    6 +-
 .../core/iterators/user/ColumnSliceFilterTest.java |    3 +-
 .../accumulo/core/iterators/user/CombinerTest.java |   59 +-
 .../accumulo/core/iterators/user/FilterTest.java   |   27 +-
 .../core/iterators/user/GrepIteratorTest.java      |    3 +-
 .../iterators/user/IndexedDocIteratorTest.java     |   39 +-
 .../iterators/user/IntersectingIteratorTest.java   |   39 +-
 .../core/iterators/user/LargeRowFilterTest.java    |   27 +-
 .../iterators/user/RowDeletingIteratorTest.java    |    6 +-
 .../iterators/user/RowEncodingIteratorTest.java    |    9 +-
 .../core/iterators/user/RowFilterTest.java         |   12 +-
 .../core/iterators/user/TestCfCqSlice.java         |   81 +-
 .../iterators/user/TransformingIteratorTest.java   |  102 +-
 .../iterators/user/VersioningIteratorTest.java     |    3 +-
 .../core/iterators/user/VisibilityFilterTest.java  |   15 +-
 .../user/WholeColumnFamilyIteratorTest.java        |   51 +-
 .../core/iterators/user/WholeRowIteratorTest.java  |   42 +-
 .../core/metadata/MetadataServicerTest.java        |    3 +-
 .../ReplicationConfigurationUtilTest.java          |   18 +-
 .../rpc/SaslClientDigestCallbackHandlerTest.java   |    5 +-
 .../core/rpc/SaslConnectionParamsTest.java         |  121 +-
 .../accumulo/core/rpc/TTimeoutTransportTest.java   |   10 +-
 .../AuthenticationTokenIdentifierTest.java         |    6 +-
 .../core/security/AuthenticationTokenTest.java     |    6 +-
 .../accumulo/core/security/AuthorizationsTest.java |    3 +-
 .../core/security/ColumnVisibilityTest.java        |    6 +-
 .../accumulo/core/security/CredentialsTest.java    |   19 +-
 .../core/security/NamespacePermissionsTest.java    |    3 +-
 .../core/security/VisibilityConstraintTest.java    |    3 +-
 .../core/security/VisibilityEvaluatorTest.java     |   33 +-
 .../core/security/crypto/BlockedIOStreamTest.java  |    3 +-
 .../accumulo/core/security/crypto/CryptoTest.java  |   99 +-
 .../accumulo/core/util/ByteBufferUtilTest.java     |    6 +-
 .../core/util/CompletableFutureUtilTest.java       |    6 +-
 .../accumulo/core/util/LocalityGroupUtilTest.java  |    3 +-
 .../org/apache/accumulo/core/util/MergeTest.java   |   12 +-
 .../org/apache/accumulo/core/util/OpTimerTest.java |   15 +-
 .../org/apache/accumulo/core/util/PairTest.java    |    3 +-
 .../apache/accumulo/core/util/PartitionerTest.java |    3 +-
 .../accumulo/core/util/PreAllocatedArrayTest.java  |    3 +-
 .../core/util/format/DateFormatSupplierTest.java   |    6 +-
 .../core/util/format/DefaultFormatterTest.java     |    9 +-
 .../core/util/format/FormatterFactoryTest.java     |    3 +-
 .../apache/accumulo/fate/AcceptableException.java  |   12 +-
 .../java/org/apache/accumulo/fate/AdminUtil.java   |   56 +-
 .../java/org/apache/accumulo/fate/AgeOffStore.java |    6 +-
 .../main/java/org/apache/accumulo/fate/Fate.java   |   21 +-
 .../org/apache/accumulo/fate/ReadOnlyRepo.java     |    4 +-
 .../org/apache/accumulo/fate/ReadOnlyStore.java    |    6 +-
 .../org/apache/accumulo/fate/ReadOnlyTStore.java   |   19 +-
 .../main/java/org/apache/accumulo/fate/TStore.java |    7 +-
 .../java/org/apache/accumulo/fate/ZooStore.java    |   27 +-
 .../org/apache/accumulo/fate/util/AddressUtil.java |   23 +-
 .../apache/accumulo/fate/util/LoggingRunnable.java |    9 +-
 .../java/org/apache/accumulo/fate/util/Retry.java  |   47 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  |    8 +-
 .../fate/zookeeper/DistributedReadWriteLock.java   |   20 +-
 .../apache/accumulo/fate/zookeeper/IZooReader.java |    9 +-
 .../accumulo/fate/zookeeper/IZooReaderWriter.java  |   24 +-
 .../apache/accumulo/fate/zookeeper/ZooCache.java   |   63 +-
 .../accumulo/fate/zookeeper/ZooCacheFactory.java   |    7 +-
 .../apache/accumulo/fate/zookeeper/ZooLock.java    |   49 +-
 .../accumulo/fate/zookeeper/ZooQueueLock.java      |    3 +-
 .../apache/accumulo/fate/zookeeper/ZooReader.java  |   42 +-
 .../accumulo/fate/zookeeper/ZooReaderWriter.java   |   43 +-
 .../accumulo/fate/zookeeper/ZooReservation.java    |   12 +-
 .../apache/accumulo/fate/zookeeper/ZooSession.java |   18 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java    |   72 +-
 .../org/apache/accumulo/fate/AgeOffStoreTest.java  |   12 +-
 .../apache/accumulo/fate/ReadOnlyStoreTest.java    |    6 +-
 .../java/org/apache/accumulo/fate/SimpleStore.java |    6 +-
 .../apache/accumulo/fate/util/AddressUtilTest.java |   15 +-
 .../org/apache/accumulo/fate/util/RetryTest.java   |   29 +-
 .../accumulo/fate/zookeeper/ZooCacheTest.java      |   24 +-
 .../zookeeper/ZooKeeperConnectionInfoTest.java     |    7 +-
 .../fate/zookeeper/ZooReaderWriterTest.java        |   17 +-
 .../iteratortest/IteratorTestCaseFinder.java       |    9 +-
 .../accumulo/iteratortest/IteratorTestInput.java   |   26 +-
 .../accumulo/iteratortest/IteratorTestOutput.java  |   11 +-
 .../accumulo/iteratortest/IteratorTestReport.java  |    6 +-
 .../accumulo/iteratortest/IteratorTestRunner.java  |   14 +-
 .../accumulo/iteratortest/IteratorTestUtil.java    |    3 +-
 .../iteratortest/SimpleKVReusingIterator.java      |    9 +-
 .../environments/SimpleIteratorEnvironment.java    |    3 +-
 .../junit4/BaseJUnit4IteratorTest.java             |   12 +-
 .../testcases/InstantiationTestCase.java           |    3 +-
 .../testcases/IsolatedDeepCopiesTestCase.java      |   24 +-
 .../iteratortest/testcases/IteratorTestCase.java   |    7 +-
 .../testcases/MultipleHasTopCalls.java             |   13 +-
 .../testcases/OutputVerifyingTestCase.java         |    3 +-
 .../iteratortest/testcases/ReSeekTestCase.java     |   20 +-
 .../iteratortest/testcases/YieldingTestCase.java   |   24 +-
 .../iteratortest/framework/JUnitFrameworkTest.java |    3 +-
 .../maven/plugin/AbstractAccumuloMojo.java         |    6 +-
 .../apache/accumulo/maven/plugin/StartMojo.java    |   24 +-
 .../org/apache/accumulo/maven/plugin/StopMojo.java |    6 +-
 .../apache/accumulo/cluster/AccumuloCluster.java   |    6 +-
 .../apache/accumulo/cluster/ClusterControl.java    |    9 +-
 .../org/apache/accumulo/cluster/ClusterUser.java   |    6 +-
 .../org/apache/accumulo/cluster/ClusterUsers.java  |    3 +-
 .../org/apache/accumulo/cluster/RemoteShell.java   |   12 +-
 .../accumulo/cluster/RemoteShellOptions.java       |    5 +-
 .../standalone/StandaloneAccumuloCluster.java      |   23 +-
 .../standalone/StandaloneClusterControl.java       |   54 +-
 .../apache/accumulo/minicluster/MemoryUnit.java    |    5 +-
 .../accumulo/minicluster/MiniAccumuloCluster.java  |   18 +-
 .../accumulo/minicluster/MiniAccumuloConfig.java   |   18 +-
 .../accumulo/minicluster/MiniAccumuloInstance.java |    7 +-
 .../accumulo/minicluster/MiniAccumuloRunner.java   |   64 +-
 .../apache/accumulo/minicluster/ServerType.java    |    7 +-
 .../impl/MiniAccumuloClusterControl.java           |   16 +-
 .../minicluster/impl/MiniAccumuloClusterImpl.java  |  128 +-
 .../minicluster/impl/MiniAccumuloConfigImpl.java   |   76 +-
 .../minicluster/impl/ProcessReference.java         |    3 +-
 .../minicluster/impl/ZooKeeperBindException.java   |    3 +-
 .../standalone/StandaloneAccumuloClusterTest.java  |    6 +-
 .../standalone/StandaloneClusterControlTest.java   |   15 +-
 .../MiniAccumuloClusterExistingZooKeepersTest.java |   13 +-
 .../MiniAccumuloClusterStartStopTest.java          |    3 +-
 .../minicluster/MiniAccumuloClusterTest.java       |   20 +-
 .../minicluster/impl/CleanShutdownMacTest.java     |    6 +-
 .../impl/MiniAccumuloClusterImplTest.java          |   18 +-
 .../impl/MiniAccumuloConfigImplTest.java           |   15 +-
 pom.xml                                            |   50 +-
 .../main/java/org/apache/accumulo/proxy/Proxy.java |   59 +-
 .../org/apache/accumulo/proxy/ProxyServer.java     |  803 ++++++++-----
 .../main/java/org/apache/accumulo/proxy/Util.java  |   15 +-
 .../org/apache/accumulo/proxy/ProxyServerTest.java |    6 +-
 .../java/org/apache/accumulo/server/Accumulo.java  |   68 +-
 .../accumulo/server/AccumuloServerContext.java     |   27 +-
 .../accumulo/server/GarbageCollectionLogger.java   |    9 +-
 .../accumulo/server/HighlyAvailableService.java    |    4 +-
 .../apache/accumulo/server/ServerConstants.java    |   44 +-
 .../org/apache/accumulo/server/ServerOpts.java     |    3 +-
 .../accumulo/server/client/BulkImporter.java       |  172 ++-
 .../server/client/ClientServiceHandler.java        |  181 +--
 .../accumulo/server/client/HdfsZooInstance.java    |   27 +-
 .../accumulo/server/conf/NamespaceConfWatcher.java |   13 +-
 .../server/conf/NamespaceConfiguration.java        |   12 +-
 .../server/conf/ServerConfigurationFactory.java    |   18 +-
 .../accumulo/server/conf/TableConfWatcher.java     |   13 +-
 .../accumulo/server/conf/TableConfiguration.java   |   15 +-
 .../server/conf/ZooCachePropertyAccessor.java      |   15 +-
 .../accumulo/server/conf/ZooConfiguration.java     |    6 +-
 .../server/conf/ZooConfigurationFactory.java       |   15 +-
 .../server/constraints/MetadataConstraints.java    |   60 +-
 .../accumulo/server/data/ServerColumnUpdate.java   |    3 +-
 .../accumulo/server/data/ServerMutation.java       |    6 +-
 .../org/apache/accumulo/server/fs/FileRef.java     |    8 +-
 .../accumulo/server/fs/PerTableVolumeChooser.java  |   66 +-
 .../accumulo/server/fs/PreferredVolumeChooser.java |   61 +-
 .../accumulo/server/fs/RandomVolumeChooser.java    |    3 +-
 .../org/apache/accumulo/server/fs/ViewFSUtils.java |    6 +-
 .../apache/accumulo/server/fs/VolumeChooser.java   |   12 +-
 .../apache/accumulo/server/fs/VolumeManager.java   |   18 +-
 .../accumulo/server/fs/VolumeManagerImpl.java      |   63 +-
 .../org/apache/accumulo/server/fs/VolumeUtil.java  |   56 +-
 .../apache/accumulo/server/init/Initialize.java    |  350 ++++--
 .../server/iterators/MetadataBulkLoadFilter.java   |    3 +-
 .../apache/accumulo/server/log/SortedLogState.java |    5 +-
 .../accumulo/server/log/WalStateManager.java       |   44 +-
 .../accumulo/server/master/LiveTServerSet.java     |   81 +-
 .../master/balancer/ChaoticLoadBalancer.java       |   22 +-
 .../master/balancer/DefaultLoadBalancer.java       |   33 +-
 .../server/master/balancer/GroupBalancer.java      |   94 +-
 .../balancer/HostRegexTableLoadBalancer.java       |  126 +-
 .../server/master/balancer/RegexGroupBalancer.java |   35 +-
 .../server/master/balancer/TableLoadBalancer.java  |   25 +-
 .../server/master/balancer/TabletBalancer.java     |   86 +-
 .../server/master/recovery/HadoopLogCloser.java    |    3 +-
 .../accumulo/server/master/state/CurrentState.java |    3 +-
 .../accumulo/server/master/state/MergeInfo.java    |    3 +-
 .../accumulo/server/master/state/MergeState.java   |    6 +-
 .../server/master/state/MetaDataStateStore.java    |   21 +-
 .../server/master/state/MetaDataTableScanner.java  |   20 +-
 .../server/master/state/RootTabletStateStore.java  |    3 +-
 .../server/master/state/TServerInstance.java       |    6 +-
 .../server/master/state/TabletLocationState.java   |   26 +-
 .../master/state/TabletStateChangeIterator.java    |   15 +-
 .../server/master/state/TabletStateStore.java      |   46 +-
 .../server/master/state/ZooTabletStateStore.java   |   21 +-
 .../master/tableOps/UserCompactionConfig.java      |    3 +-
 .../server/metrics/AbstractMetricsImpl.java        |   16 +-
 .../server/metrics/MetricsConfiguration.java       |   14 +-
 .../server/metrics/MetricsSystemHelper.java        |    3 +-
 .../accumulo/server/metrics/ThriftMetrics.java     |    3 +-
 .../accumulo/server/monitor/DedupedLogEvent.java   |    6 +-
 .../apache/accumulo/server/monitor/LogService.java |    6 +-
 .../accumulo/server/problems/ProblemReport.java    |   27 +-
 .../server/problems/ProblemReportingIterator.java  |   19 +-
 .../accumulo/server/problems/ProblemReports.java   |   33 +-
 .../DistributedWorkQueueWorkAssignerHelper.java    |   22 +-
 .../replication/PrintReplicationRecords.java       |    6 +-
 .../accumulo/server/replication/ReplicaSystem.java |    6 +-
 .../server/replication/ReplicaSystemFactory.java   |   15 +-
 .../server/replication/ReplicaSystemHelper.java    |   10 +-
 .../server/replication/ReplicationUtil.java        |   33 +-
 .../server/replication/StatusCombiner.java         |   20 +-
 .../server/replication/StatusFormatter.java        |   10 +-
 .../accumulo/server/replication/StatusUtil.java    |   15 +-
 .../replication/ZooKeeperInitialization.java       |    6 +-
 .../server/rpc/ClientInfoProcessorFactory.java     |    3 +-
 .../server/rpc/CustomNonBlockingServer.java        |   25 +-
 .../HighlyAvailableServiceInvocationHandler.java   |    8 +-
 .../server/rpc/HighlyAvailableServiceWrapper.java  |   11 +-
 .../org/apache/accumulo/server/rpc/RpcWrapper.java |   30 +-
 .../server/rpc/SaslServerConnectionParams.java     |    9 +-
 .../rpc/SaslServerDigestCallbackHandler.java       |   12 +-
 .../rpc/TCredentialsUpdatingInvocationHandler.java |   65 +-
 .../server/rpc/TCredentialsUpdatingWrapper.java    |   13 +-
 .../apache/accumulo/server/rpc/TServerUtils.java   |  281 +++--
 .../accumulo/server/rpc/ThriftServerType.java      |   10 +-
 .../apache/accumulo/server/rpc/TimedProcessor.java |    6 +-
 .../accumulo/server/rpc/UGIAssumingProcessor.java  |    6 +-
 .../server/security/AuditedSecurityOperation.java  |  272 +++--
 .../server/security/SecurityOperation.java         |  391 ++++---
 .../accumulo/server/security/SecurityUtil.java     |   36 +-
 .../server/security/SystemCredentials.java         |   15 +-
 .../server/security/UserImpersonation.java         |   37 +-
 .../security/delegation/AuthenticationKey.java     |   12 +-
 .../delegation/AuthenticationTokenKeyManager.java  |   21 +-
 .../AuthenticationTokenSecretManager.java          |   36 +-
 .../ZooAuthenticationKeyDistributor.java           |   36 +-
 .../delegation/ZooAuthenticationKeyWatcher.java    |   24 +-
 .../server/security/handler/Authenticator.java     |   11 +-
 .../server/security/handler/Authorizor.java        |   14 +-
 .../security/handler/InsecureAuthenticator.java    |   14 +-
 .../security/handler/InsecurePermHandler.java      |   54 +-
 .../security/handler/KerberosAuthenticator.java    |   30 +-
 .../security/handler/KerberosAuthorizor.java       |   24 +-
 .../handler/KerberosPermissionHandler.java         |   91 +-
 .../server/security/handler/PermissionHandler.java |   62 +-
 .../server/security/handler/ZKAuthenticator.java   |   28 +-
 .../server/security/handler/ZKAuthorizor.java      |   19 +-
 .../server/security/handler/ZKPermHandler.java     |  135 ++-
 .../server/security/handler/ZKSecurityTool.java    |   16 +-
 .../accumulo/server/tables/TableManager.java       |  160 +--
 .../server/tablets/UniqueNameAllocator.java        |   26 +-
 .../tabletserver/LargestFirstMemoryManager.java    |   37 +-
 .../server/tabletserver/MemoryManager.java         |   14 +-
 .../accumulo/server/util/AccumuloStatus.java       |    3 +-
 .../org/apache/accumulo/server/util/Admin.java     |   96 +-
 .../apache/accumulo/server/util/ChangeSecret.java  |   28 +-
 .../server/util/CheckForMetadataProblems.java      |   21 +-
 .../accumulo/server/util/CleanZookeeper.java       |   10 +-
 .../apache/accumulo/server/util/DefaultMap.java    |    3 +-
 .../apache/accumulo/server/util/DumpZookeeper.java |   12 +-
 .../accumulo/server/util/FileSystemMonitor.java    |    6 +-
 .../org/apache/accumulo/server/util/FileUtil.java  |  147 ++-
 .../accumulo/server/util/FindOfflineTablets.java   |   21 +-
 .../apache/accumulo/server/util/ListInstances.java |   23 +-
 .../accumulo/server/util/ListVolumesUsed.java      |   15 +-
 .../apache/accumulo/server/util/LocalityCheck.java |    9 +-
 .../accumulo/server/util/LoginProperties.java      |   12 +-
 .../accumulo/server/util/MasterMetadataUtil.java   |   95 +-
 .../accumulo/server/util/MetadataTableUtil.java    |  285 +++--
 .../accumulo/server/util/NamespacePropUtil.java    |   21 +-
 .../apache/accumulo/server/util/RandomWriter.java  |    6 +-
 .../accumulo/server/util/RandomizeVolumes.java     |   14 +-
 .../server/util/RemoveEntriesForMissingFiles.java  |   17 +-
 .../accumulo/server/util/ReplicationTableUtil.java |   30 +-
 .../accumulo/server/util/RestoreZookeeper.java     |    6 +-
 .../accumulo/server/util/SendLogToChainsaw.java    |   32 +-
 .../accumulo/server/util/SystemPropUtil.java       |   27 +-
 .../accumulo/server/util/TableDiskUsage.java       |   14 +-
 .../apache/accumulo/server/util/TableInfoUtil.java |    3 +-
 .../apache/accumulo/server/util/TablePropUtil.java |   18 +-
 .../accumulo/server/util/TabletIterator.java       |   32 +-
 .../accumulo/server/util/TabletServerLocks.java    |    3 +-
 .../server/util/VerifyTabletAssignments.java       |   22 +-
 .../apache/accumulo/server/util/ZooKeeperMain.java |   12 +-
 .../org/apache/accumulo/server/util/ZooZap.java    |    6 +-
 .../server/util/time/BaseRelativeTime.java         |    3 +-
 .../accumulo/server/util/time/SimpleTimer.java     |   21 +-
 .../server/zookeeper/DistributedWorkQueue.java     |   21 +-
 .../server/zookeeper/TransactionWatcher.java       |   21 +-
 .../apache/accumulo/server/zookeeper/ZooLock.java  |    3 +-
 .../accumulo/server/zookeeper/ZooQueueLock.java    |    3 +-
 .../accumulo/server/zookeeper/ZooReaderWriter.java |    3 +-
 .../server/zookeeper/ZooReaderWriterFactory.java   |    6 +-
 .../accumulo/server/AccumuloServerContextTest.java |   42 +-
 .../org/apache/accumulo/server/AccumuloTest.java   |    6 +-
 .../accumulo/server/ServerConstantsTest.java       |   51 +-
 .../org/apache/accumulo/server/ServerOptsTest.java |    3 +-
 .../accumulo/server/client/BulkImporterTest.java   |   52 +-
 .../server/conf/NamespaceConfigurationTest.java    |   27 +-
 .../conf/ServerConfigurationFactoryTest.java       |    3 +-
 .../server/conf/TableConfigurationTest.java        |   24 +-
 .../constraints/MetadataConstraintsTest.java       |   72 +-
 .../org/apache/accumulo/server/fs/FileRefTest.java |   72 +-
 .../apache/accumulo/server/fs/FileTypeTest.java    |   75 +-
 .../server/fs/PerTableVolumeChooserTest.java       |   33 +-
 .../server/fs/PreferredVolumeChooserTest.java      |   33 +-
 .../apache/accumulo/server/fs/ViewFSUtilsTest.java |   41 +-
 .../accumulo/server/fs/VolumeManagerImplTest.java  |   12 +-
 .../apache/accumulo/server/fs/VolumeUtilTest.java  |  153 ++-
 .../accumulo/server/init/InitializeTest.java       |   12 +-
 .../iterators/MetadataBulkLoadFilterTest.java      |    6 +-
 .../accumulo/server/master/LiveTServerSetTest.java |    6 +-
 .../BaseHostRegexTableLoadBalancerTest.java        |   96 +-
 .../master/balancer/ChaoticLoadBalancerTest.java   |   18 +-
 .../master/balancer/DefaultLoadBalancerTest.java   |   29 +-
 .../server/master/balancer/GroupBalancerTest.java  |   45 +-
 ...tRegexTableLoadBalancerReconfigurationTest.java |   24 +-
 .../balancer/HostRegexTableLoadBalancerTest.java   |   80 +-
 .../master/balancer/TableLoadBalancerTest.java     |   29 +-
 .../server/master/state/MergeInfoTest.java         |    3 +-
 .../server/problems/ProblemReportTest.java         |   36 +-
 .../server/replication/ReplicationUtilTest.java    |    6 +-
 .../server/replication/StatusCombinerTest.java     |  114 +-
 .../server/replication/StatusUtilTest.java         |   15 +-
 .../replication/ZooKeeperInitializationTest.java   |   12 +-
 .../server/rpc/SaslDigestCallbackHandlerTest.java  |   15 +-
 .../server/rpc/SaslServerConnectionParamsTest.java |    3 +-
 .../TCredentialsUpdatingInvocationHandlerTest.java |   63 +-
 .../accumulo/server/rpc/ThriftServerTypeTest.java  |    3 +-
 .../server/security/SystemCredentialsTest.java     |   27 +-
 .../server/security/UserImpersonationTest.java     |   18 +-
 .../security/delegation/AuthenticationKeyTest.java |    9 +-
 .../AuthenticationTokenKeyManagerTest.java         |   32 +-
 .../AuthenticationTokenSecretManagerTest.java      |   99 +-
 .../ZooAuthenticationKeyDistributorTest.java       |   70 +-
 .../ZooAuthenticationKeyWatcherTest.java           |   68 +-
 .../security/handler/ZKAuthenticatorTest.java      |    6 +-
 .../IllegalTableTransitionExceptionTest.java       |    6 +-
 .../org/apache/accumulo/server/util/AdminTest.java |   23 +-
 .../accumulo/server/util/DefaultMapTest.java       |    3 +-
 .../server/util/FileSystemMonitorTest.java         |   39 +-
 .../apache/accumulo/server/util/FileUtilTest.java  |   15 +-
 .../server/util/ReplicationTableUtilTest.java      |   21 +-
 .../accumulo/server/util/TServerUtilsTest.java     |   47 +-
 .../server/util/time/BaseRelativeTimeTest.java     |    3 +-
 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  |   43 +-
 .../accumulo/gc/GarbageCollectionAlgorithm.java    |   60 +-
 .../accumulo/gc/GarbageCollectionEnvironment.java  |   37 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  108 +-
 .../replication/CloseWriteAheadLogReferences.java  |   30 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java       |   60 +-
 .../apache/accumulo/gc/GarbageCollectionTest.java  |   47 +-
 .../accumulo/gc/SimpleGarbageCollectorTest.java    |   30 +-
 .../apache/accumulo/master/FateServiceHandler.java |  248 ++--
 .../java/org/apache/accumulo/master/Master.java    |  334 ++++--
 .../master/MasterClientServiceHandler.java         |  150 ++-
 .../org/apache/accumulo/master/MasterTime.java     |   21 +-
 .../apache/accumulo/master/TabletGroupWatcher.java |  145 ++-
 .../master/metrics/Metrics2ReplicationMetrics.java |   23 +-
 .../master/metrics/ReplicationMetrics.java         |    4 +-
 .../master/metrics/ReplicationMetricsMBean.java    |   14 +-
 .../accumulo/master/recovery/RecoveryManager.java  |   35 +-
 .../DistributedWorkQueueWorkAssigner.java          |   30 +-
 .../master/replication/FinishedWorkUpdater.java    |   30 +-
 .../replication/MasterReplicationCoordinator.java  |   23 +-
 .../RemoveCompleteReplicationRecords.java          |   29 +-
 .../master/replication/ReplicationDriver.java      |    6 +-
 .../master/replication/SequentialWorkAssigner.java |   30 +-
 .../accumulo/master/replication/StatusMaker.java   |   34 +-
 .../master/replication/UnorderedWorkAssigner.java  |   26 +-
 .../accumulo/master/replication/WorkMaker.java     |    9 +-
 .../apache/accumulo/master/state/MergeStats.java   |   51 +-
 .../apache/accumulo/master/state/SetGoalState.java |    8 +-
 .../accumulo/master/tableOps/BulkImport.java       |   35 +-
 .../master/tableOps/CancelCompactions.java         |    7 +-
 .../accumulo/master/tableOps/ChangeTableState.java |    6 +-
 .../apache/accumulo/master/tableOps/ChooseDir.java |    6 +-
 .../apache/accumulo/master/tableOps/CleanUp.java   |   27 +-
 .../master/tableOps/CleanUpBulkImport.java         |    3 +-
 .../accumulo/master/tableOps/CloneMetadata.java    |   14 +-
 .../accumulo/master/tableOps/ClonePermissions.java |    9 +-
 .../accumulo/master/tableOps/CloneTable.java       |   10 +-
 .../accumulo/master/tableOps/CloneZookeeper.java   |    9 +-
 .../accumulo/master/tableOps/CompactRange.java     |   35 +-
 .../accumulo/master/tableOps/CompactionDriver.java |   26 +-
 .../accumulo/master/tableOps/CopyFailed.java       |   16 +-
 .../accumulo/master/tableOps/CreateImportDir.java  |    3 +-
 .../accumulo/master/tableOps/CreateNamespace.java  |    3 +-
 .../accumulo/master/tableOps/CreateTable.java      |    3 +-
 .../accumulo/master/tableOps/DeleteTable.java      |    3 +-
 .../accumulo/master/tableOps/ExportTable.java      |    3 +-
 .../accumulo/master/tableOps/FinishCloneTable.java |    9 +-
 .../master/tableOps/FinishCreateNamespace.java     |    3 +-
 .../master/tableOps/FinishCreateTable.java         |    3 +-
 .../master/tableOps/FinishImportTable.java         |    3 +-
 .../master/tableOps/ImportPopulateZookeeper.java   |   16 +-
 .../master/tableOps/ImportSetupPermissions.java    |    6 +-
 .../accumulo/master/tableOps/ImportTable.java      |    9 +-
 .../apache/accumulo/master/tableOps/LoadFiles.java |   23 +-
 .../master/tableOps/MapImportFileNames.java        |    5 +-
 .../master/tableOps/MoveExportedFiles.java         |   10 +-
 .../accumulo/master/tableOps/PopulateMetadata.java |    6 +-
 .../master/tableOps/PopulateMetadataTable.java     |   48 +-
 .../master/tableOps/PopulateZookeeper.java         |    6 +-
 .../tableOps/PopulateZookeeperWithNamespace.java   |   12 +-
 .../accumulo/master/tableOps/RenameNamespace.java  |   10 +-
 .../accumulo/master/tableOps/RenameTable.java      |   21 +-
 .../master/tableOps/SetupNamespacePermissions.java |    3 +-
 .../accumulo/master/tableOps/SetupPermissions.java |    6 +-
 .../accumulo/master/tableOps/TableRangeOp.java     |   13 +-
 .../accumulo/master/tableOps/TableRangeOpWait.java |   18 +-
 .../org/apache/accumulo/master/tableOps/Utils.java |   65 +-
 .../accumulo/master/tableOps/WriteExportFiles.java |   64 +-
 .../master/tserverOps/ShutdownTServer.java         |    6 +-
 .../org/apache/accumulo/master/util/FateAdmin.java |    5 +-
 .../accumulo/master/util/TableValidators.java      |   11 +-
 .../metrics/Metrics2ReplicationMetricsTest.java    |    3 +-
 ...DistributedWorkQueueWorkAssignerHelperTest.java |    3 +-
 .../replication/SequentialWorkAssignerTest.java    |   26 +-
 .../replication/UnorderedWorkAssignerTest.java     |   20 +-
 .../accumulo/master/replication/WorkMakerTest.java |    6 +-
 .../master/state/RootTabletStateStoreTest.java     |    3 +-
 .../accumulo/master/tableOps/ImportTableTest.java  |    9 +-
 .../apache/accumulo/monitor/EmbeddedWebServer.java |    9 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |  100 +-
 .../apache/accumulo/monitor/ZooKeeperStatus.java   |    6 +-
 .../apache/accumulo/monitor/rest/XMLResource.java  |    3 +-
 .../rest/bulkImports/BulkImportResource.java       |   10 +-
 .../TabletServerBulkImportInformation.java         |    3 +-
 .../accumulo/monitor/rest/logs/LogResource.java    |    7 +-
 .../monitor/rest/master/MasterInformation.java     |   11 +-
 .../monitor/rest/master/MasterResource.java        |   23 +-
 .../rest/problems/ProblemDetailInformation.java    |    3 +-
 .../rest/problems/ProblemSummaryInformation.java   |    3 +-
 .../monitor/rest/problems/ProblemsResource.java    |   43 +-
 .../rest/replication/ReplicationInformation.java   |    3 +-
 .../rest/replication/ReplicationResource.java      |   18 +-
 .../rest/statistics/StatisticsResource.java        |    3 +-
 .../monitor/rest/status/StatusInformation.java     |    3 +-
 .../monitor/rest/status/StatusResource.java        |    8 +-
 .../monitor/rest/tables/TableInformation.java      |    3 +-
 .../monitor/rest/tables/TablesResource.java        |   18 +-
 .../monitor/rest/trace/TraceInformation.java       |    3 +-
 .../monitor/rest/trace/TracesResource.java         |   31 +-
 .../rest/tservers/AllTimeTabletResults.java        |    4 +-
 .../monitor/rest/tservers/CurrentOperations.java   |    5 +-
 .../rest/tservers/CurrentTabletResults.java        |    3 +-
 .../accumulo/monitor/rest/tservers/ServerStat.java |    6 +-
 .../tservers/TabletServerDetailInformation.java    |    3 +-
 .../rest/tservers/TabletServerResource.java        |   89 +-
 .../monitor/rest/tservers/TabletServerSummary.java |    3 +-
 .../tservers/TabletServerWithTableInformation.java |    3 +-
 .../monitor/util/AccumuloMonitorAppender.java      |   21 +-
 .../org/apache/accumulo/monitor/view/WebViews.java |   36 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java    |    3 +-
 .../accumulo/monitor/ZooKeeperStatusTest.java      |    3 +-
 .../org/apache/accumulo/monitor/it/WebViewsIT.java |   32 +-
 .../rest/tservers/TabletServerInformationTest.java |    6 +-
 .../monitor/util/AccumuloMonitorAppenderTest.java  |   43 +-
 .../monitor/util/ParameterValidatorTest.java       |    9 +-
 .../apache/accumulo/tracer/AsyncSpanReceiver.java  |    9 +-
 .../apache/accumulo/tracer/SendSpansViaThrift.java |    3 +-
 .../java/org/apache/accumulo/tracer/SpanTree.java  |    3 +-
 .../java/org/apache/accumulo/tracer/TraceDump.java |   19 +-
 .../org/apache/accumulo/tracer/TraceFormatter.java |    6 +-
 .../org/apache/accumulo/tracer/TraceServer.java    |   81 +-
 .../apache/accumulo/tracer/TraceTableStats.java    |   17 +-
 .../org/apache/accumulo/tracer/ZooTraceClient.java |    6 +-
 .../accumulo/tracer/AsyncSpanReceiverTest.java     |    9 +-
 .../org/apache/accumulo/tracer/TracerTest.java     |   16 +-
 .../apache/accumulo/tracer/ZooTraceClientTest.java |   12 +-
 .../accumulo/tserver/ActiveAssignmentRunnable.java |    9 +-
 .../apache/accumulo/tserver/CompactionQueue.java   |    6 +-
 .../accumulo/tserver/ConditionCheckerContext.java  |   30 +-
 .../accumulo/tserver/ConditionalMutationSet.java   |   15 +-
 .../org/apache/accumulo/tserver/FileManager.java   |   60 +-
 .../org/apache/accumulo/tserver/InMemoryMap.java   |   71 +-
 .../java/org/apache/accumulo/tserver/MemKey.java   |    3 +-
 .../accumulo/tserver/MemKeyConversionIterator.java |    3 +-
 .../java/org/apache/accumulo/tserver/MemValue.java |    3 +-
 .../org/apache/accumulo/tserver/NativeMap.java     |   94 +-
 .../java/org/apache/accumulo/tserver/RowLocks.java |    6 +-
 .../tserver/TConstraintViolationException.java     |    3 +-
 .../tserver/TabletIteratorEnvironment.java         |   29 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  787 ++++++++-----
 .../tserver/TabletServerResourceManager.java       |  120 +-
 .../accumulo/tserver/TservConstraintEnv.java       |    4 +-
 .../org/apache/accumulo/tserver/WriteTracker.java  |    7 +-
 .../tserver/compaction/CompactionPlan.java         |    7 +-
 .../tserver/compaction/CompactionStrategy.java     |   49 +-
 .../compaction/DefaultCompactionStrategy.java      |    3 +-
 .../compaction/EverythingCompactionStrategy.java   |    3 +-
 .../tserver/compaction/MajorCompactionReason.java  |    5 +-
 .../tserver/compaction/MajorCompactionRequest.java |   68 +-
 .../compaction/TwoTierCompactionStrategy.java      |   27 +-
 .../strategies/ConfigurableCompactionStrategy.java |   46 +-
 .../TooManyDeletesCompactionStrategy.java          |   69 +-
 .../tserver/constraints/ConstraintChecker.java     |   15 +-
 .../tserver/data/ServerConditionalMutation.java    |    3 +-
 .../org/apache/accumulo/tserver/log/DfsLogger.java |  103 +-
 .../org/apache/accumulo/tserver/log/LogSorter.java |   18 +-
 .../apache/accumulo/tserver/log/MultiReader.java   |    8 +-
 .../accumulo/tserver/log/SortedLogRecovery.java    |   38 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |   69 +-
 .../apache/accumulo/tserver/logger/LogEvents.java  |    7 +-
 .../apache/accumulo/tserver/logger/LogFileKey.java |    6 +-
 .../accumulo/tserver/logger/LogFileValue.java      |    8 +-
 .../apache/accumulo/tserver/logger/LogReader.java  |    6 +-
 .../tserver/mastermessage/MasterMessage.java       |    3 +-
 .../tserver/mastermessage/SplitReportMessage.java  |    6 +-
 .../tserver/mastermessage/TabletStatusMessage.java |    3 +-
 .../metrics/Metrics2TabletServerMetrics.java       |   46 +-
 .../metrics/Metrics2TabletServerMinCMetrics.java   |    6 +-
 .../metrics/Metrics2TabletServerScanMetrics.java   |    6 +-
 .../metrics/Metrics2TabletServerUpdateMetrics.java |   30 +-
 .../tserver/metrics/TabletServerMBeanImpl.java     |    4 +-
 .../metrics/TabletServerMetricsFactory.java        |    3 +-
 .../tserver/metrics/TabletServerMinCMetrics.java   |   10 +-
 .../tserver/metrics/TabletServerScanMetrics.java   |   10 +-
 .../tserver/metrics/TabletServerUpdateMetrics.java |   10 +-
 .../tserver/replication/AccumuloReplicaSystem.java |  209 ++--
 .../BatchWriterReplicationReplayer.java            |   41 +-
 .../tserver/replication/ReplicationProcessor.java  |   21 +-
 .../replication/ReplicationServicerHandler.java    |   23 +-
 .../tserver/replication/ReplicationWorker.java     |    9 +-
 .../apache/accumulo/tserver/scan/LookupTask.java   |   24 +-
 .../accumulo/tserver/scan/NextBatchTask.java       |   17 +-
 .../org/apache/accumulo/tserver/scan/ScanTask.java |    9 +-
 .../tserver/session/ConditionalSession.java        |    3 +-
 .../accumulo/tserver/session/MultiScanSession.java |    6 +-
 .../accumulo/tserver/session/ScanSession.java      |    5 +-
 .../accumulo/tserver/session/SessionManager.java   |   32 +-
 .../tserver/tablet/BulkImportCacheCleaner.java     |    3 +-
 .../accumulo/tserver/tablet/CompactionInfo.java    |    9 +-
 .../accumulo/tserver/tablet/CompactionRunner.java  |    3 +-
 .../accumulo/tserver/tablet/CompactionWatcher.java |   14 +-
 .../apache/accumulo/tserver/tablet/Compactor.java  |   51 +-
 .../accumulo/tserver/tablet/CountingIterator.java  |    3 +-
 .../accumulo/tserver/tablet/DatafileManager.java   |  114 +-
 .../tserver/tablet/MinorCompactionTask.java        |   23 +-
 .../accumulo/tserver/tablet/MinorCompactor.java    |   68 +-
 .../apache/accumulo/tserver/tablet/RootFiles.java  |   30 +-
 .../accumulo/tserver/tablet/ScanDataSource.java    |   70 +-
 .../accumulo/tserver/tablet/ScanOptions.java       |    6 +-
 .../apache/accumulo/tserver/tablet/Scanner.java    |   22 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  547 +++++----
 .../accumulo/tserver/tablet/TabletCommitter.java   |    5 +-
 .../apache/accumulo/tserver/tablet/TabletData.java |   13 +-
 .../accumulo/tserver/tablet/TabletMemory.java      |    3 +-
 .../accumulo/tserver/CheckTabletMetadataTest.java  |   24 +-
 .../apache/accumulo/tserver/InMemoryMapTest.java   |   55 +-
 .../tserver/LargestFirstMemoryManagerTest.java     |   87 +-
 .../tserver/TabletServerSyncCheckTest.java         |   12 +-
 .../accumulo/tserver/TservConstraintEnvTest.java   |    9 +-
 .../compaction/DefaultCompactionStrategyTest.java  |   24 +-
 .../SizeLimitCompactionStrategyTest.java           |   12 +-
 .../compaction/TwoTierCompactionStrategyTest.java  |   19 +-
 .../ConfigurableCompactionStrategyTest.java        |   15 +-
 .../accumulo/tserver/log/MultiReaderTest.java      |    8 +-
 .../tserver/log/SortedLogRecoveryTest.java         |  215 ++--
 .../tserver/log/TestUpgradePathForWALogs.java      |   16 +-
 .../accumulo/tserver/logger/LogFileTest.java       |   11 +-
 .../replication/AccumuloReplicaSystemTest.java     |   74 +-
 .../BatchWriterReplicationReplayerTest.java        |    6 +-
 .../replication/ReplicationProcessorTest.java      |    6 +-
 .../tserver/tablet/DatafileManagerTest.java        |   27 +-
 .../accumulo/tserver/tablet/RootFilesTest.java     |   12 +-
 .../apache/accumulo/tserver/tablet/TabletTest.java |    9 +-
 .../main/java/org/apache/accumulo/shell/Shell.java |  261 +++--
 .../org/apache/accumulo/shell/ShellCompletor.java  |    3 +-
 .../org/apache/accumulo/shell/ShellOptionsJC.java  |   70 +-
 .../java/org/apache/accumulo/shell/ShellUtil.java  |    5 +-
 .../accumulo/shell/commands/AboutCommand.java      |    3 +-
 .../shell/commands/ActiveCompactionIterator.java   |   15 +-
 .../shell/commands/ActiveScanIterator.java         |   16 +-
 .../accumulo/shell/commands/AddAuthsCommand.java   |   12 +-
 .../accumulo/shell/commands/AddSplitsCommand.java  |    9 +-
 .../shell/commands/AuthenticateCommand.java        |    9 +-
 .../shell/commands/BulkImportListIterator.java     |    3 +-
 .../accumulo/shell/commands/ClearCommand.java      |    3 +-
 .../accumulo/shell/commands/CloneTableCommand.java |   20 +-
 .../accumulo/shell/commands/CompactCommand.java    |   89 +-
 .../accumulo/shell/commands/ConfigCommand.java     |   76 +-
 .../accumulo/shell/commands/ConstraintCommand.java |   40 +-
 .../shell/commands/CreateNamespaceCommand.java     |   12 +-
 .../shell/commands/CreateTableCommand.java         |   87 +-
 .../accumulo/shell/commands/CreateUserCommand.java |   11 +-
 .../apache/accumulo/shell/commands/DUCommand.java  |   24 +-
 .../accumulo/shell/commands/DebugCommand.java      |   12 +-
 .../shell/commands/DeleteAuthsCommand.java         |    9 +-
 .../accumulo/shell/commands/DeleteCommand.java     |   11 +-
 .../accumulo/shell/commands/DeleteIterCommand.java |   27 +-
 .../accumulo/shell/commands/DeleteManyCommand.java |   14 +-
 .../shell/commands/DeleteNamespaceCommand.java     |   12 +-
 .../accumulo/shell/commands/DeleteRowsCommand.java |   12 +-
 .../shell/commands/DeleteScanIterCommand.java      |   18 +-
 .../shell/commands/DeleteShellIterCommand.java     |    6 +-
 .../shell/commands/DeleteTableCommand.java         |    3 +-
 .../accumulo/shell/commands/DropUserCommand.java   |   12 +-
 .../accumulo/shell/commands/EGrepCommand.java      |   15 +-
 .../accumulo/shell/commands/ExecfileCommand.java   |    6 +-
 .../shell/commands/ExportTableCommand.java         |    8 +-
 .../accumulo/shell/commands/FateCommand.java       |   31 +-
 .../accumulo/shell/commands/FlushCommand.java      |    6 +-
 .../accumulo/shell/commands/FormatterCommand.java  |   19 +-
 .../accumulo/shell/commands/GetAuthsCommand.java   |    6 +-
 .../accumulo/shell/commands/GetGroupsCommand.java  |    9 +-
 .../accumulo/shell/commands/GetSplitsCommand.java  |   33 +-
 .../accumulo/shell/commands/GrantCommand.java      |   37 +-
 .../accumulo/shell/commands/GrepCommand.java       |   15 +-
 .../accumulo/shell/commands/HelpCommand.java       |   21 +-
 .../accumulo/shell/commands/HiddenCommand.java     |   16 +-
 .../accumulo/shell/commands/HistoryCommand.java    |    6 +-
 .../shell/commands/ImportDirectoryCommand.java     |   10 +-
 .../shell/commands/ImportTableCommand.java         |    5 +-
 .../accumulo/shell/commands/InsertCommand.java     |   20 +-
 .../shell/commands/InterpreterCommand.java         |    6 +-
 .../accumulo/shell/commands/ListBulkCommand.java   |    6 +-
 .../shell/commands/ListCompactionsCommand.java     |    7 +-
 .../accumulo/shell/commands/ListIterCommand.java   |   39 +-
 .../accumulo/shell/commands/ListScansCommand.java  |    6 +-
 .../shell/commands/ListShellIterCommand.java       |   12 +-
 .../accumulo/shell/commands/MaxRowCommand.java     |    7 +-
 .../accumulo/shell/commands/MergeCommand.java      |   16 +-
 .../commands/NamespacePermissionsCommand.java      |    3 +-
 .../accumulo/shell/commands/NamespacesCommand.java |    9 +-
 .../accumulo/shell/commands/NoTableCommand.java    |    3 +-
 .../accumulo/shell/commands/OfflineCommand.java    |    6 +-
 .../accumulo/shell/commands/OnlineCommand.java     |    6 +-
 .../apache/accumulo/shell/commands/OptUtil.java    |   16 +-
 .../accumulo/shell/commands/PasswdCommand.java     |   15 +-
 .../accumulo/shell/commands/PingCommand.java       |    3 +-
 .../shell/commands/QuotedStringTokenizer.java      |   12 +-
 .../shell/commands/RenameNamespaceCommand.java     |    8 +-
 .../shell/commands/RenameTableCommand.java         |    8 +-
 .../accumulo/shell/commands/RevokeCommand.java     |   37 +-
 .../accumulo/shell/commands/ScanCommand.java       |  133 ++-
 .../accumulo/shell/commands/ScriptCommand.java     |    6 +-
 .../accumulo/shell/commands/SetAuthsCommand.java   |   12 +-
 .../accumulo/shell/commands/SetGroupsCommand.java  |    3 +-
 .../accumulo/shell/commands/SetIterCommand.java    |  106 +-
 .../shell/commands/SetScanIterCommand.java         |   18 +-
 .../shell/commands/SetShellIterCommand.java        |   15 +-
 .../commands/ShellPluginConfigurationCommand.java  |   40 +-
 .../accumulo/shell/commands/SleepCommand.java      |    3 +-
 .../accumulo/shell/commands/SummariesCommand.java  |   13 +-
 .../shell/commands/SystemPermissionsCommand.java   |    3 +-
 .../accumulo/shell/commands/TableCommand.java      |    7 +-
 .../accumulo/shell/commands/TableOperation.java    |   21 +-
 .../shell/commands/TablePermissionsCommand.java    |    3 +-
 .../accumulo/shell/commands/TablesCommand.java     |   14 +-
 .../accumulo/shell/commands/TraceCommand.java      |   15 +-
 .../accumulo/shell/commands/UserCommand.java       |    6 +-
 .../shell/commands/UserPermissionsCommand.java     |   12 +-
 .../accumulo/shell/commands/UsersCommand.java      |    3 +-
 .../accumulo/shell/commands/WhoAmICommand.java     |    3 +-
 .../accumulo/shell/format/DeleterFormatter.java    |    9 +-
 .../org/apache/accumulo/shell/mock/MockShell.java  |    8 +-
 .../org/apache/accumulo/shell/ShellConfigTest.java |    6 +-
 .../accumulo/shell/ShellSetInstanceTest.java       |   18 +-
 .../java/org/apache/accumulo/shell/ShellTest.java  |   44 +-
 .../org/apache/accumulo/shell/ShellUtilTest.java   |    6 +-
 .../shell/commands/CompactCommandTest.java         |    3 +-
 .../shell/commands/DeleteAuthsCommandTest.java     |    9 +-
 .../shell/commands/DeleteManyCommandTest.java      |    3 +-
 .../shell/commands/DeleteRowsCommandTest.java      |    3 +-
 .../shell/commands/DeleteTableCommandTest.java     |    3 +-
 .../accumulo/shell/commands/FlushCommandTest.java  |    3 +-
 .../shell/commands/HistoryCommandTest.java         |    6 +-
 .../accumulo/shell/commands/MergeCommandTest.java  |    3 +-
 .../accumulo/shell/commands/ScanCommandTest.java   |    3 +-
 .../shell/commands/SetIterCommandTest.java         |   25 +-
 .../shell/format/DeleterFormatterTest.java         |   18 +-
 .../main/java/org/apache/accumulo/start/Main.java  |   57 +-
 .../java/org/apache/accumulo/start/TestMain.java   |    5 +-
 .../start/classloader/AccumuloClassLoader.java     |   38 +-
 .../vfs/AccumuloReloadingVFSClassLoader.java       |   17 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java    |   65 +-
 .../start/classloader/vfs/ContextManager.java      |    9 +-
 .../vfs/PostDelegatingVFSClassLoader.java          |    6 +-
 .../classloader/vfs/UniqueFileReplicator.java      |    3 +-
 .../accumulo/start/spi/KeywordExecutable.java      |   18 +-
 .../test/categories/MiniClusterOnlyTests.java      |    3 +-
 .../accumulo/test/categories/MonitorTests.java     |    3 +-
 .../accumulo/test/categories/PerformanceTests.java |    8 +-
 .../categories/StandaloneCapableClusterTests.java  |    4 +-
 .../accumulo/test/categories/SunnyDayTests.java    |    4 +-
 .../accumulo/test/categories/package-info.java     |    1 -
 .../classloader/vfs/AccumuloClasspathTest.java     |    6 +-
 .../vfs/AccumuloReloadingVFSClassLoaderTest.java   |   76 +-
 .../vfs/AccumuloVFSClassLoaderTest.java            |   33 +-
 .../start/classloader/vfs/ContextManagerTest.java  |   12 +-
 .../accumulo/start/test/AccumuloDFSBase.java       |   10 +-
 .../accumulo/harness/AccumuloClusterHarness.java   |   79 +-
 .../apache/accumulo/harness/AccumuloITBase.java    |   28 +-
 .../harness/MiniClusterConfigurationCallback.java  |    3 +-
 .../accumulo/harness/MiniClusterHarness.java       |  113 +-
 .../accumulo/harness/SharedMiniClusterBase.java    |   55 +-
 .../org/apache/accumulo/harness/TestingKdc.java    |    9 +-
 .../conf/AccumuloClusterPropertyConfiguration.java |   18 +-
 .../conf/AccumuloMiniClusterConfiguration.java     |    6 +-
 .../StandaloneAccumuloClusterConfiguration.java    |   54 +-
 .../accumulo/test/ArbitraryTablePropertiesIT.java  |   12 +-
 .../org/apache/accumulo/test/AuditMessageIT.java   |  234 ++--
 .../accumulo/test/BadDeleteMarkersCreatedIT.java   |    6 +-
 .../accumulo/test/BatchWriterInTabletServerIT.java |   19 +-
 .../apache/accumulo/test/BatchWriterIterator.java  |   50 +-
 .../accumulo/test/BulkImportMonitoringIT.java      |   10 +-
 .../accumulo/test/BulkImportSequentialRowsIT.java  |   12 +-
 .../java/org/apache/accumulo/test/CleanWalIT.java  |    6 +-
 .../apache/accumulo/test/ClientSideIteratorIT.java |    9 +-
 .../java/org/apache/accumulo/test/CloneIT.java     |   30 +-
 .../accumulo/test/CompactionRateLimitingIT.java    |   10 +-
 .../apache/accumulo/test/ConditionalWriterIT.java  |  310 +++--
 .../test/ConfigurableMajorCompactionIT.java        |    3 +-
 .../org/apache/accumulo/test/CreateRFiles.java     |   11 +-
 .../apache/accumulo/test/CreateRandomRFile.java    |    3 +-
 .../accumulo/test/DetectDeadTabletServersIT.java   |    3 +-
 .../org/apache/accumulo/test/DumpConfigIT.java     |   10 +-
 .../accumulo/test/EstimateInMemMapOverhead.java    |    6 +-
 .../org/apache/accumulo/test/ExistingMacIT.java    |   22 +-
 .../accumulo/test/FaultyConditionalWriter.java     |    6 +-
 .../org/apache/accumulo/test/FileArchiveIT.java    |   33 +-
 .../java/org/apache/accumulo/test/FindMaxIT.java   |   30 +-
 .../apache/accumulo/test/GarbageCollectWALIT.java  |    3 +-
 .../accumulo/test/GenerateSequentialRFile.java     |    6 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java    |    7 +-
 .../org/apache/accumulo/test/GetMasterStats.java   |    3 +-
 .../org/apache/accumulo/test/HardListIterator.java |   30 +-
 .../org/apache/accumulo/test/IMMLGBenchmark.java   |   19 +-
 .../org/apache/accumulo/test/ImportExportIT.java   |   30 +-
 .../org/apache/accumulo/test/InMemoryMapIT.java    |   83 +-
 .../accumulo/test/InMemoryMapMemoryUsageTest.java  |    3 +-
 .../accumulo/test/InterruptibleScannersIT.java     |    6 +-
 .../accumulo/test/IsolationAndDeepCopyIT.java      |    9 +-
 .../apache/accumulo/test/KeyValueEqualityIT.java   |   10 +-
 .../org/apache/accumulo/test/LargeSplitRowIT.java  |   48 +-
 .../java/org/apache/accumulo/test/LocatorIT.java   |   16 +-
 .../java/org/apache/accumulo/test/ManySplitIT.java |    3 +-
 .../test/MasterRepairsDualAssignmentIT.java        |    6 +-
 .../org/apache/accumulo/test/MemoryUsageTest.java  |    8 +-
 .../accumulo/test/MetaConstraintRetryIT.java       |    3 +-
 .../apache/accumulo/test/MetaGetsReadersIT.java    |    3 +-
 .../java/org/apache/accumulo/test/MetaSplitIT.java |    9 +-
 .../test/MissingWalHeaderCompletesRecoveryIT.java  |   33 +-
 .../accumulo/test/MultiTableBatchWriterIT.java     |   12 +-
 .../apache/accumulo/test/MultiTableRecoveryIT.java |    3 +-
 .../org/apache/accumulo/test/NamespacesIT.java     |  160 ++-
 .../accumulo/test/NativeMapConcurrencyTest.java    |    9 +-
 .../accumulo/test/NativeMapPerformanceTest.java    |   19 +-
 .../apache/accumulo/test/NativeMapStressTest.java  |   29 +-
 .../accumulo/test/NewTableConfigurationIT.java     |  217 ++--
 .../org/apache/accumulo/test/NullBatchWriter.java  |    3 +-
 .../org/apache/accumulo/test/OrIteratorIT.java     |   21 +-
 .../apache/accumulo/test/QueryMetadataTable.java   |    6 +-
 .../accumulo/test/RewriteTabletDirectoriesIT.java  |   24 +-
 .../java/org/apache/accumulo/test/SampleIT.java    |   56 +-
 .../org/apache/accumulo/test/ShellConfigIT.java    |   26 +-
 .../org/apache/accumulo/test/ShellServerIT.java    |  243 ++--
 .../org/apache/accumulo/test/SplitRecoveryIT.java  |    9 +-
 .../accumulo/test/TableConfigurationUpdateIT.java  |   13 +-
 .../apache/accumulo/test/TableOperationsIT.java    |   50 +-
 .../org/apache/accumulo/test/TestBinaryRows.java   |   38 +-
 .../java/org/apache/accumulo/test/TestIngest.java  |   44 +-
 .../apache/accumulo/test/TestMultiTableIngest.java |    9 +-
 .../apache/accumulo/test/TestRandomDeletes.java    |   19 +-
 .../apache/accumulo/test/TextMemoryUsageTest.java  |    4 +-
 .../ThriftServerBindsBeforeZooKeeperLockIT.java    |   30 +-
 .../org/apache/accumulo/test/TotalQueuedIT.java    |   17 +-
 .../test/TracerRecoversAfterOfflineTableIT.java    |    3 +-
 .../apache/accumulo/test/TransportCachingIT.java   |    9 +-
 .../java/org/apache/accumulo/test/UnusedWALIT.java |    9 +-
 .../accumulo/test/UserCompactionStrategyIT.java    |   57 +-
 .../java/org/apache/accumulo/test/UsersIT.java     |    9 +-
 .../org/apache/accumulo/test/VerifyIngest.java     |   41 +-
 .../accumulo/test/VerifySerialRecoveryIT.java      |    3 +-
 .../accumulo/test/VolumeChooserFailureIT.java      |   27 +-
 .../org/apache/accumulo/test/VolumeChooserIT.java  |  105 +-
 .../java/org/apache/accumulo/test/VolumeIT.java    |   71 +-
 .../org/apache/accumulo/test/WaitForBalanceIT.java |    9 +-
 .../org/apache/accumulo/test/WrongTabletTest.java  |    5 +-
 .../org/apache/accumulo/test/YieldScannersIT.java  |   30 +-
 .../test/constraints/NumericValueConstraint.java   |    3 +-
 .../accumulo/test/functional/AddSplitIT.java       |    3 +-
 .../accumulo/test/functional/AuthsIterator.java    |    3 +-
 .../accumulo/test/functional/BackupMasterIT.java   |    3 +-
 .../test/functional/BadIteratorMincIT.java         |    3 +-
 .../functional/BalanceAfterCommsFailureIT.java     |   16 +-
 .../BalanceInPresenceOfOfflineTableIT.java         |   19 +-
 .../accumulo/test/functional/BatchScanSplitIT.java |    9 +-
 .../test/functional/BatchWriterFlushIT.java        |   15 +-
 .../accumulo/test/functional/BigRootTabletIT.java  |    9 +-
 .../accumulo/test/functional/BloomFilterIT.java    |   30 +-
 .../accumulo/test/functional/BulkFileIT.java       |   18 +-
 .../apache/accumulo/test/functional/BulkIT.java    |   11 +-
 .../test/functional/BulkSplitOptimizationIT.java   |    9 +-
 .../test/functional/ChaoticBalancerIT.java         |    6 +-
 .../accumulo/test/functional/ClassLoaderIT.java    |    9 +-
 .../apache/accumulo/test/functional/CleanUpIT.java |   14 +-
 .../accumulo/test/functional/CloneTestIT.java      |   26 +-
 .../accumulo/test/functional/CombinerIT.java       |    3 +-
 .../accumulo/test/functional/CompactionIT.java     |    3 +-
 .../accumulo/test/functional/ConcurrencyIT.java    |    8 +-
 .../test/functional/ConcurrentDeleteTableIT.java   |    3 +-
 .../test/functional/ConfigurableCompactionIT.java  |   21 +-
 .../test/functional/ConfigurableMacBase.java       |   39 +-
 .../accumulo/test/functional/ConnectorIT.java      |    6 +-
 .../accumulo/test/functional/ConstraintIT.java     |   63 +-
 .../accumulo/test/functional/CreateAndUseIT.java   |    3 +-
 .../accumulo/test/functional/CredentialsIT.java    |    6 +-
 .../test/functional/DeleteEverythingIT.java        |    6 +-
 .../apache/accumulo/test/functional/DeleteIT.java  |   15 +-
 .../accumulo/test/functional/DeleteRowsIT.java     |   10 +-
 .../accumulo/test/functional/DropModIter.java      |    6 +-
 .../accumulo/test/functional/DurabilityIT.java     |    3 +-
 .../test/functional/DynamicThreadPoolsIT.java      |    3 +-
 .../test/functional/FunctionalTestUtils.java       |   36 +-
 .../test/functional/GarbageCollectorIT.java        |   20 +-
 .../test/functional/HalfDeadTServerIT.java         |   16 +-
 .../accumulo/test/functional/KerberosIT.java       |  222 ++--
 .../accumulo/test/functional/KerberosProxyIT.java  |  172 +--
 .../test/functional/KerberosRenewalIT.java         |   44 +-
 .../accumulo/test/functional/LargeRowIT.java       |   18 +-
 .../test/functional/LateLastContactIT.java         |    3 +-
 .../accumulo/test/functional/LogicalTimeIT.java    |   62 +-
 .../accumulo/test/functional/MapReduceIT.java      |   13 +-
 .../test/functional/MasterAssignmentIT.java        |    6 +-
 .../apache/accumulo/test/functional/MaxOpenIT.java |    9 +-
 .../apache/accumulo/test/functional/MergeIT.java   |   64 +-
 .../test/functional/MetadataMaxFilesIT.java        |    3 +-
 .../accumulo/test/functional/MetadataSplitIT.java  |    3 +-
 .../accumulo/test/functional/MonitorSslIT.java     |   30 +-
 .../accumulo/test/functional/NativeMapIT.java      |   47 +-
 .../accumulo/test/functional/PermissionsIT.java    |  194 +--
 .../accumulo/test/functional/ReadWriteIT.java      |   96 +-
 .../test/functional/RecoveryWithEmptyRFileIT.java  |   14 +-
 .../test/functional/RegexGroupBalanceIT.java       |   23 +-
 .../apache/accumulo/test/functional/RestartIT.java |   37 +-
 .../accumulo/test/functional/RestartStressIT.java  |    8 +-
 .../apache/accumulo/test/functional/ScanIdIT.java  |   53 +-
 .../accumulo/test/functional/ScanIteratorIT.java   |   40 +-
 .../accumulo/test/functional/ScanRangeIT.java      |   18 +-
 .../test/functional/ScanSessionTimeOutIT.java      |    3 +-
 .../accumulo/test/functional/ScannerContextIT.java |   27 +-
 .../apache/accumulo/test/functional/ScannerIT.java |    6 +-
 .../test/functional/SessionBlockVerifyIT.java      |   17 +-
 .../test/functional/SessionDurabilityIT.java       |    3 +-
 .../accumulo/test/functional/ShutdownIT.java       |   28 +-
 .../test/functional/SimpleBalancerFairnessIT.java  |   10 +-
 .../accumulo/test/functional/SlowIterator.java     |    6 +-
 .../test/functional/SparseColumnFamilyIT.java      |    3 +-
 .../apache/accumulo/test/functional/SplitIT.java   |   16 +-
 .../accumulo/test/functional/SplitRecoveryIT.java  |   76 +-
 .../org/apache/accumulo/test/functional/SslIT.java |   13 +-
 .../apache/accumulo/test/functional/SummaryIT.java |  166 ++-
 .../test/functional/TableChangeStateIT.java        |   93 +-
 .../apache/accumulo/test/functional/TabletIT.java  |    6 +-
 .../functional/TabletStateChangeIteratorIT.java    |   76 +-
 .../apache/accumulo/test/functional/TimeoutIT.java |    3 +-
 .../accumulo/test/functional/TooManyDeletesIT.java |   15 +-
 .../accumulo/test/functional/VisibilityIT.java     |   33 +-
 .../accumulo/test/functional/WALSunnyDayIT.java    |   24 +-
 .../test/functional/WatchTheWatchCountIT.java      |    6 +-
 .../accumulo/test/functional/WriteLotsIT.java      |    3 +-
 .../accumulo/test/functional/YieldingIterator.java |   27 +-
 .../accumulo/test/functional/ZombieTServer.java    |   26 +-
 .../accumulo/test/functional/ZooCacheIT.java       |    6 +-
 .../CloseWriteAheadLogReferencesIT.java            |   45 +-
 .../test/mapred/AccumuloFileOutputFormatIT.java    |   21 +-
 .../test/mapred/AccumuloInputFormatIT.java         |   19 +-
 .../mapred/AccumuloMultiTableInputFormatIT.java    |    9 +-
 .../test/mapred/AccumuloOutputFormatIT.java        |   15 +-
 .../test/mapred/AccumuloRowInputFormatIT.java      |   18 +-
 .../apache/accumulo/test/mapred/TokenFileIT.java   |   12 +-
 .../test/mapreduce/AccumuloFileOutputFormatIT.java |   33 +-
 .../test/mapreduce/AccumuloInputFormatIT.java      |   91 +-
 .../mapreduce/AccumuloMultiTableInputFormatIT.java |   12 +-
 .../test/mapreduce/AccumuloOutputFormatIT.java     |    9 +-
 .../test/mapreduce/AccumuloRowInputFormatIT.java   |   21 +-
 .../apache/accumulo/test/mapreduce/RowHash.java    |    3 +-
 .../accumulo/test/mapreduce/TokenFileIT.java       |   12 +-
 .../apache/accumulo/test/master/MergeStateIT.java  |   32 +-
 .../accumulo/test/master/SuspendedTabletsIT.java   |   47 +-
 .../test/mrit/IntegrationTestMapReduce.java        |   19 +-
 .../test/performance/ContinuousIngest.java         |   41 +-
 .../accumulo/test/performance/ContinuousOpts.java  |   15 +-
 .../accumulo/test/performance/NullTserver.java     |  110 +-
 .../test/performance/RollWALPerformanceIT.java     |    5 +-
 .../performance/metadata/FastBulkImportIT.java     |    3 +-
 .../metadata/MetadataBatchScanTest.java            |   19 +-
 .../test/performance/scan/CollectTabletStats.java  |   84 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java     |    9 +-
 .../accumulo/test/proxy/SimpleProxyBase.java       |  525 ++++++---
 .../accumulo/test/proxy/TestProxyClient.java       |   17 +-
 .../test/proxy/TestProxyInstanceOperations.java    |   10 +-
 .../test/proxy/TestProxyNamespaceOperations.java   |   39 +-
 .../accumulo/test/proxy/TestProxyReadWrite.java    |   60 +-
 .../test/proxy/TestProxySecurityOperations.java    |   26 +-
 .../test/proxy/TestProxyTableOperations.java       |   24 +-
 .../test/replication/CyclicReplicationIT.java      |   88 +-
 .../test/replication/FinishedWorkUpdaterIT.java    |   64 +-
 ...GarbageCollectorCommunicatesWithTServersIT.java |   82 +-
 .../test/replication/KerberosReplicationIT.java    |   32 +-
 .../test/replication/MockReplicaSystem.java        |   19 +-
 .../replication/MultiInstanceReplicationIT.java    |  194 +--
 .../replication/MultiTserverReplicationIT.java     |    9 +-
 .../RemoveCompleteReplicationRecordsIT.java        |   45 +-
 .../accumulo/test/replication/ReplicationIT.java   |  255 ++--
 .../replication/ReplicationOperationsImplIT.java   |   45 +-
 .../test/replication/SequentialWorkAssignerIT.java |   75 +-
 .../test/replication/StatusCombinerMacIT.java      |   15 +-
 .../accumulo/test/replication/StatusMakerIT.java   |   47 +-
 .../test/replication/UnorderedWorkAssignerIT.java  |   38 +-
 .../UnorderedWorkAssignerReplicationIT.java        |  194 +--
 .../UnusedWalDoesntCloseReplicationStatusIT.java   |   27 +-
 .../accumulo/test/replication/WorkMakerIT.java     |   39 +-
 .../java/org/apache/accumulo/test/rpc/Mocket.java  |    5 +-
 .../test/rpc/SimpleThriftServiceRunner.java        |    3 +-
 .../apache/accumulo/test/rpc/ThriftBehaviorIT.java |   15 +-
 .../test/server/security/SystemCredentialsIT.java  |   39 +-
 .../apache/accumulo/test/start/KeywordStartIT.java |   18 +-
 .../org/apache/accumulo/test/util/CertUtils.java   |  103 +-
 .../accumulo/test/util/SerializationUtil.java      |   17 +-
 .../constraints/AlphaNumKeyConstraintTest.java     |   13 +-
 .../constraints/NumericValueConstraintTest.java    |    6 +-
 .../accumulo/test/fate/zookeeper/ZooLockTest.java  |   36 +-
 .../test/functional/ValueReversingIterator.java    |    6 +-
 .../accumulo/test/iterator/AgeOffFilterTest.java   |    9 +-
 .../test/iterator/CfCqSliceFilterTest.java         |    6 +-
 .../apache/accumulo/test/iterator/RegExTest.java   |    9 +-
 .../test/iterator/SummingCombinerTest.java         |    6 +-
 .../test/iterator/WholeRowIteratorTest.java        |    6 +-
 .../apache/accumulo/test/util/CertUtilsTest.java   |   24 +-
 1467 files changed, 30421 insertions(+), 16778 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ctubb...@apache.org.

Reply via email to