You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/08/10 08:21:10 UTC
[17/17] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19de9683
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19de9683
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/19de9683
Branch: refs/heads/master
Commit: 19de9683cde47eefb773ab6c3598b8be2197ad98
Parents: 3c7b3da 0277521
Author: Josh Elser <el...@apache.org>
Authored: Sun Aug 10 02:18:45 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Aug 10 02:18:45 2014 -0400
----------------------------------------------------------------------
.../minicluster/MiniAccumuloCluster.java | 2 +
.../impl/MiniAccumuloClusterImpl.java | 9 ++-
.../MiniAccumuloClusterStartStopTest.java | 68 ++++++++++++++++++++
.../minicluster/MiniAccumuloClusterTest.java | 3 -
.../impl/MiniAccumuloClusterGCTest.java | 2 -
minicluster/src/test/resources/log4j.properties | 1 +
.../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +-
7 files changed, 79 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/19de9683/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/19de9683/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
----------------------------------------------------------------------