Updated Branches: refs/heads/master b3205260c -> 0c8bb6c01
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/782262a6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/782262a6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/782262a6 Branch: refs/heads/master Commit: 782262a6bc942225ea080454b354959276b1189d Parents: 6c4fa8e 9d1e171 Author: Eric Newton <eric.new...@gmail.com> Authored: Mon Jan 13 15:05:17 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Jan 13 15:05:17 2014 -0500 ---------------------------------------------------------------------- .../util/shell/commands/CreateTableCommand.java | 11 +- .../maven/plugin/AbstractAccumuloMojo.java | 4 +- .../apache/accumulo/maven/plugin/StartMojo.java | 9 +- .../apache/accumulo/maven/plugin/StopMojo.java | 5 +- .../minicluster/MiniAccumuloCluster.java | 545 +--------------- .../minicluster/MiniAccumuloConfig.java | 264 +------- .../minicluster/MiniAccumuloInstance.java | 1 + .../minicluster/MiniAccumuloRunner.java | 6 +- .../minicluster/ProcessNotFoundException.java | 23 - .../accumulo/minicluster/ProcessReference.java | 47 -- .../impl/MiniAccumuloClusterImpl.java | 642 +++++++++++++++++++ .../impl/MiniAccumuloConfigImpl.java | 443 +++++++++++++ .../impl/ProcessNotFoundException.java | 23 + .../minicluster/impl/ProcessReference.java | 47 ++ .../minicluster/MiniAccumuloClusterGCTest.java | 153 ----- .../minicluster/MiniAccumuloClusterTest.java | 19 - .../minicluster/MiniAccumuloConfigTest.java | 82 --- .../impl/MiniAccumuloClusterGCTest.java | 153 +++++ .../impl/MiniAccumuloClusterImplTest.java | 75 +++ .../impl/MiniAccumuloConfigImplTest.java | 84 +++ .../java/org/apache/accumulo/proxy/Proxy.java | 2 +- .../apache/accumulo/proxy/SimpleProxyIT.java | 2 +- .../monitor/servlets/DefaultServlet.java | 2 +- .../accumulo/fate/zookeeper/ZooLockTest.java | 36 +- .../apache/accumulo/test/AuditMessageIT.java | 4 +- .../org/apache/accumulo/test/CleanWalIT.java | 6 +- .../test/ConfigurableMajorCompactionIT.java | 4 +- .../org/apache/accumulo/test/DumpConfigIT.java | 4 +- .../java/org/apache/accumulo/test/VolumeIT.java | 4 +- .../accumulo/test/functional/AbstractMacIT.java | 10 +- .../functional/BalanceAfterCommsFailureIT.java | 4 +- .../test/functional/BatchScanSplitIT.java | 4 +- .../test/functional/BigRootTabletIT.java | 4 +- .../test/functional/BinaryStressIT.java | 4 +- .../accumulo/test/functional/BloomFilterIT.java | 4 +- .../functional/BulkSplitOptimizationIT.java | 4 +- .../test/functional/ChaoticBalancerIT.java | 4 +- .../accumulo/test/functional/CleanTmpIT.java | 6 +- .../accumulo/test/functional/CompactionIT.java | 4 +- .../accumulo/test/functional/ConcurrencyIT.java | 4 +- .../functional/ConfigurableCompactionIT.java | 4 +- .../test/functional/ConfigurableMacIT.java | 14 +- .../test/functional/DeleteEverythingIT.java | 4 +- .../accumulo/test/functional/DeleteIT.java | 4 +- .../test/functional/DynamicThreadPoolsIT.java | 4 +- .../accumulo/test/functional/ExamplesIT.java | 6 +- .../test/functional/FunctionalTestUtils.java | 6 +- .../test/functional/GarbageCollectorIT.java | 128 ++-- .../test/functional/HalfDeadTServerIT.java | 4 +- .../accumulo/test/functional/LargeRowIT.java | 4 +- .../test/functional/LateLastContactIT.java | 4 +- .../accumulo/test/functional/MapReduceIT.java | 4 +- .../test/functional/MasterFailoverIT.java | 6 +- .../accumulo/test/functional/MaxOpenIT.java | 4 +- .../test/functional/MetadataMaxFiles.java | 4 +- .../test/functional/MetadataSplitIT.java | 4 +- .../accumulo/test/functional/RestartIT.java | 6 +- .../test/functional/RestartStressIT.java | 4 +- .../accumulo/test/functional/RowDeleteIT.java | 4 +- .../test/functional/ScanSessionTimeOutIT.java | 4 +- .../accumulo/test/functional/ShutdownIT.java | 4 +- .../functional/SimpleBalancerFairnessIT.java | 4 +- .../accumulo/test/functional/SimpleMacIT.java | 12 +- .../accumulo/test/functional/SplitIT.java | 4 +- .../apache/accumulo/test/functional/SslIT.java | 4 +- .../test/functional/SslWithClientAuthIT.java | 4 +- .../accumulo/test/functional/TabletIT.java | 4 +- .../test/functional/WriteAheadLogIT.java | 6 +- .../test/functional/ZookeeperRestartIT.java | 6 +- 69 files changed, 1739 insertions(+), 1283 deletions(-) ----------------------------------------------------------------------
