This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 2f6becc ACCUMULO-4703 New formatter version code changes new 6e2e2e7 ACCUMULO-4702 Merged up Guava changes from #299 add d472fd2 ACCUMULO-4702 Checkstyle corrections add b25f679 ACCUMULO-4702 Removed Beta Guava dependencies add dea1937 Merge branch '1.7' into 1.8 add b95db79 ACCUMULO-4702 Removed Beta Guava code where possible add 2962878 ACCUMULO-4702 Removed Beta Guava dependencies (#299) add 8fdfb3d Merge branch '1.7' into 1.8 new 1eead7b Merge branch '1.8' The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accumulo/core/client/IsolatedScanner.java | 2 +- .../core/client/impl/ConditionalWriterImpl.java | 2 +- .../accumulo/core/client/impl/MasterClient.java | 2 +- .../accumulo/core/client/impl/OfflineIterator.java | 2 +- .../client/impl/ReplicationOperationsImpl.java | 2 +- .../core/client/impl/RootTabletLocator.java | 2 +- .../accumulo/core/client/impl/ServerClient.java | 2 +- .../core/client/impl/TableOperationsImpl.java | 2 +- .../core/client/impl/TabletLocatorImpl.java | 2 +- .../apache/accumulo/core/client/impl/Writer.java | 2 +- .../core/client/mapred/AbstractInputFormat.java | 2 +- .../core/client/mapreduce/AbstractInputFormat.java | 2 +- .../core/file/rfile/VisMetricsGatherer.java | 20 +++++++----- .../accumulo/core/client/TestThrift1474.java | 2 +- .../java/org/apache/accumulo/fate/ZooStore.java | 2 +- .../apache/accumulo/fate/util/UtilWaitThread.java | 36 ++++++++++++++++++++++ .../accumulo/minicluster/MiniAccumuloRunner.java | 7 +++-- .../minicluster/impl/MiniAccumuloClusterImpl.java | 2 +- .../main/java/org/apache/accumulo/proxy/Proxy.java | 4 +-- .../java/org/apache/accumulo/server/Accumulo.java | 2 +- .../accumulo/server/client/BulkImporter.java | 2 +- .../java/org/apache/accumulo/server/util/Halt.java | 2 +- .../accumulo/server/util/MasterMetadataUtil.java | 2 +- .../accumulo/server/util/MetadataTableUtil.java | 2 +- .../accumulo/server/util/ReplicationTableUtil.java | 2 +- .../accumulo/server/util/TabletIterator.java | 2 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../java/org/apache/accumulo/master/Master.java | 2 +- .../master/MasterClientServiceHandler.java | 2 +- .../apache/accumulo/master/TabletGroupWatcher.java | 2 +- .../DistributedWorkQueueWorkAssigner.java | 2 +- .../master/replication/UnorderedWorkAssigner.java | 2 +- .../accumulo/master/replication/WorkDriver.java | 2 +- .../accumulo/master/tableOps/BulkImport.java | 2 +- .../apache/accumulo/master/tableOps/LoadFiles.java | 2 +- .../java/org/apache/accumulo/monitor/Monitor.java | 2 +- .../apache/accumulo/monitor/ZooKeeperStatus.java | 2 +- .../org/apache/accumulo/tracer/TraceServer.java | 2 +- .../org/apache/accumulo/tserver/InMemoryMap.java | 2 +- .../org/apache/accumulo/tserver/TabletServer.java | 2 +- .../tserver/TabletServerResourceManager.java | 2 +- .../accumulo/tserver/log/TabletServerLogger.java | 2 +- .../tserver/replication/AccumuloReplicaSystem.java | 2 +- .../accumulo/tserver/tablet/DatafileManager.java | 2 +- .../accumulo/tserver/tablet/MinorCompactor.java | 2 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 2 +- .../accumulo/shell/commands/TraceCommand.java | 2 +- .../accumulo/test/BadDeleteMarkersCreatedIT.java | 2 +- .../org/apache/accumulo/test/BalanceFasterIT.java | 2 +- .../java/org/apache/accumulo/test/CleanWalIT.java | 2 +- .../apache/accumulo/test/ConditionalWriterIT.java | 2 +- .../apache/accumulo/test/GetFileInfoBulkIT.java | 4 +-- .../org/apache/accumulo/test/IMMLGBenchmark.java | 2 +- .../apache/accumulo/test/MetaGetsReadersIT.java | 2 +- .../apache/accumulo/test/MultiTableRecoveryIT.java | 2 +- .../org/apache/accumulo/test/NamespacesIT.java | 2 +- .../accumulo/test/NativeMapPerformanceTest.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../apache/accumulo/test/SplitCancelsMajCIT.java | 2 +- .../org/apache/accumulo/test/SplitRecoveryIT.java | 2 +- .../apache/accumulo/test/TableOperationsIT.java | 2 +- .../accumulo/test/TabletServerGivesUpIT.java | 2 +- .../org/apache/accumulo/test/TotalQueuedIT.java | 2 +- .../test/TracerRecoversAfterOfflineTableIT.java | 2 +- .../accumulo/test/functional/AddSplitIT.java | 2 +- .../test/functional/BadIteratorMincIT.java | 2 +- .../accumulo/test/functional/BatchScanSplitIT.java | 2 +- .../test/functional/BatchWriterFlushIT.java | 2 +- .../test/functional/BulkSplitOptimizationIT.java | 2 +- .../accumulo/test/functional/CacheTestReader.java | 2 +- .../accumulo/test/functional/CacheTestWriter.java | 2 +- .../accumulo/test/functional/ClassLoaderIT.java | 2 +- .../accumulo/test/functional/ConcurrencyIT.java | 2 +- .../accumulo/test/functional/ConstraintIT.java | 2 +- .../test/functional/DeleteEverythingIT.java | 2 +- .../test/functional/DeleteRowsSplitIT.java | 2 +- .../test/functional/DynamicThreadPoolsIT.java | 2 +- .../test/functional/GarbageCollectorIT.java | 2 +- .../test/functional/HalfDeadTServerIT.java | 2 +- .../accumulo/test/functional/LargeRowIT.java | 2 +- .../accumulo/test/functional/MetadataIT.java | 2 +- .../test/functional/MetadataMaxFilesIT.java | 2 +- .../accumulo/test/functional/MetadataSplitIT.java | 2 +- .../apache/accumulo/test/functional/RestartIT.java | 2 +- .../accumulo/test/functional/RestartStressIT.java | 2 +- .../apache/accumulo/test/functional/ScanIdIT.java | 2 +- .../test/functional/ScanSessionTimeOutIT.java | 2 +- .../test/functional/ServerSideErrorIT.java | 2 +- .../accumulo/test/functional/ShutdownIT.java | 2 +- .../test/functional/SimpleBalancerFairnessIT.java | 2 +- .../accumulo/test/functional/SlowConstraint.java | 2 +- .../accumulo/test/functional/SlowIterator.java | 2 +- .../apache/accumulo/test/functional/SplitIT.java | 2 +- .../apache/accumulo/test/functional/TimeoutIT.java | 2 +- .../accumulo/test/functional/WALSunnyDayIT.java | 2 +- .../accumulo/test/functional/ZombieTServer.java | 2 +- .../test/functional/ZookeeperRestartIT.java | 2 +- .../test/mapreduce/AccumuloInputFormatIT.java | 2 +- .../test/performance/thrift/NullTserver.java | 5 +-- .../accumulo/test/proxy/ProxyDurabilityIT.java | 2 +- .../accumulo/test/proxy/SimpleProxyBase.java | 2 +- .../replication/MultiInstanceReplicationIT.java | 2 +- .../accumulo/test/replication/ReplicationIT.java | 2 +- .../UnorderedWorkAssignerReplicationIT.java | 2 +- 104 files changed, 157 insertions(+), 115 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].