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 2016/07/11 03:03:34 UTC
[16/16] accumulo git commit: Merge branch '1.8'
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a01c7569
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a01c7569
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a01c7569
Branch: refs/heads/master
Commit: a01c75698ed83ec5e300554c63eaa2e47bd03ab1
Parents: ae7a6ec c12679a
Author: Josh Elser <el...@apache.org>
Authored: Sun Jul 10 22:31:32 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Jul 10 22:31:32 2016 -0400
----------------------------------------------------------------------
.../accumulo/harness/SharedMiniClusterBase.java | 28 ++++++++++++++----
.../test/ArbitraryTablePropertiesIT.java | 12 ++++++++
.../test/CreateTableWithNewTableConfigIT.java | 12 ++++++++
.../org/apache/accumulo/test/ShellServerIT.java | 30 ++++++++++++++------
.../accumulo/test/SplitCancelsMajCIT.java | 12 ++++++++
.../accumulo/test/functional/CleanUpIT.java | 12 ++++++++
.../functional/DeletedTablesDontFlushIT.java | 12 ++++++++
.../functional/TabletStateChangeIteratorIT.java | 12 ++++++++
.../accumulo/test/proxy/SimpleProxyBase.java | 2 ++
.../accumulo/test/proxy/TBinaryProxyIT.java | 2 ++
.../accumulo/test/proxy/TCompactProxyIT.java | 2 ++
.../test/proxy/TJsonProtocolProxyIT.java | 2 ++
.../accumulo/test/proxy/TTupleProxyIT.java | 2 ++
.../test/replication/StatusCombinerMacIT.java | 12 ++++++++
14 files changed, 139 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a01c7569/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a01c7569/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a01c7569/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index e61ec9a,0cc0b94..bc21123
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@@ -58,8 -58,11 +58,10 @@@ import org.apache.accumulo.server.maste
import org.apache.accumulo.server.master.state.TabletStateChangeIterator;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.hadoop.io.Text;
+ import org.junit.AfterClass;
+ import org.junit.BeforeClass;
import org.junit.Test;
-import com.google.common.base.Predicate;
import com.google.common.collect.Sets;
/**