accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.8'
Date Tue, 09 Aug 2016 21:23:31 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/f5c9f7f7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5c9f7f7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5c9f7f7

Branch: refs/heads/master
Commit: f5c9f7f731ebf5c5b17daf3a374b0b12edb6a0b2
Parents: 81cc8be 3fded56
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Aug 9 17:23:12 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Aug 9 17:23:12 2016 -0400

----------------------------------------------------------------------
 .../accumulo/server/util/MetadataTableUtil.java |  2 ++
 .../functional/TabletStateChangeIteratorIT.java | 22 +++++++-------------
 2 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5c9f7f7/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5c9f7f7/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 bc21123,5001f1b..62374d2
--- 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,10 -59,9 +59,8 @@@ 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;
  
  /**


Mime
View raw message