accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.6'
Date Thu, 12 Feb 2015 18:14:58 GMT
Merge branch '1.6'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a34fa87
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8a34fa87
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8a34fa87

Branch: refs/heads/master
Commit: 8a34fa875fd6a06123c1f4b532612ca2499797e7
Parents: 80e334f 1297dc7
Author: Josh Elser <elserj@apache.org>
Authored: Thu Feb 12 13:14:44 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Feb 12 13:14:44 2015 -0500

----------------------------------------------------------------------
 .../src/test/java/org/apache/accumulo/master/TestMergeState.java   | 2 ++
 test/src/test/java/org/apache/accumulo/test/ShellServerIT.java     | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a34fa87/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a34fa87/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 9296548,5159be0..2d9166e
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -71,9 -70,9 +71,10 @@@ import org.apache.hadoop.tools.DistCp
  import org.apache.log4j.Logger;
  import org.junit.After;
  import org.junit.AfterClass;
 +import org.junit.Assert;
  import org.junit.Before;
  import org.junit.BeforeClass;
+ import org.junit.Ignore;
  import org.junit.Rule;
  import org.junit.Test;
  import org.junit.rules.TestName;


Mime
View raw message