accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [2/2] accumulo git commit: Merge branch '1.8'
Date Wed, 03 May 2017 18:14:01 GMT
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/f453f4d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f453f4d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f453f4d9

Branch: refs/heads/master
Commit: f453f4d9ce1f945e1aae4301c15fb76fd088be84
Parents: 5002d16 6e9f1f7
Author: Mike Miller <mmiller@apache.org>
Authored: Wed May 3 14:09:38 2017 -0400
Committer: Mike Miller <mmiller@apache.org>
Committed: Wed May 3 14:09:38 2017 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/test/ConditionalWriterIT.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f453f4d9/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 7df5885,9ebb2bd..b642de8
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@@ -87,9 -88,10 +88,10 @@@ import org.apache.accumulo.core.trace.D
  import org.apache.accumulo.core.trace.Span;
  import org.apache.accumulo.core.trace.Trace;
  import org.apache.accumulo.core.util.FastFormat;
 -import org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint;
 +import org.apache.accumulo.test.constraints.AlphaNumKeyConstraint;
  import org.apache.accumulo.harness.AccumuloClusterHarness;
  import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
+ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
  import org.apache.accumulo.test.functional.BadIterator;
  import org.apache.accumulo.test.functional.SlowIterator;
  import org.apache.accumulo.tracer.TraceDump;


Mime
View raw message