You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2014/01/13 21:22:36 UTC
[1/3] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
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 <er...@gmail.com>
Authored: Mon Jan 13 15:05:17 2014 -0500
Committer: Eric Newton <er...@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(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2167 removed deprecation from
ZooKeeperInstance(String, String) constructor
Posted by kt...@apache.org.
ACCUMULO-2167 removed deprecation from ZooKeeperInstance(String, String) constructor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e99275f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e99275f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e99275f9
Branch: refs/heads/master
Commit: e99275f9241c6297072d09d40eb6b2fbe3cc8ffa
Parents: 782262a
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jan 13 15:11:54 2014 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Jan 13 15:16:59 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e99275f9/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 8b0546a..f776a79 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -78,9 +78,7 @@ public class ZooKeeperInstance implements Instance {
* The name of specific accumulo instance. This is set at initialization time.
* @param zooKeepers
* A comma separated list of zoo keeper server locations. Each location can contain an optional port, of the format host:port.
- * @deprecated since 1.6.0; Use {@link #ZooKeeperInstance(Configuration)} instead.
*/
- @Deprecated
public ZooKeeperInstance(String instanceName, String zooKeepers) {
this(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers));
}
[3/3] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Posted by kt...@apache.org.
Merge remote-tracking branch 'origin/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/0c8bb6c0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c8bb6c0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c8bb6c0
Branch: refs/heads/master
Commit: 0c8bb6c014b18569a2111a0c31a5ba87134bb0c5
Parents: b320526 e99275f
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jan 13 15:26:50 2014 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Jan 13 15:26:50 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------