accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/4] accumulo git commit: Merge branch '1.6'
Date Thu, 12 Feb 2015 02:16:07 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/80e334f3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80e334f3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80e334f3

Branch: refs/heads/master
Commit: 80e334f316f0e9da595c0ac935e89e28c0fbddaf
Parents: 9af7c1c fe77101
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Feb 11 21:11:49 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Feb 11 21:11:49 2015 -0500

----------------------------------------------------------------------
 .../master/state/TabletStateChangeIterator.java |  17 +-
 .../functional/TabletStateChangeIteratorIT.java | 170 +++++++++++++++++++
 2 files changed, 186 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/80e334f3/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index 9351cd0,7ad74fe..1721be1
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@@ -41,9 -42,9 +41,11 @@@ import org.apache.accumulo.server.maste
  import org.apache.hadoop.io.DataInputBuffer;
  import org.apache.hadoop.io.DataOutputBuffer;
  import org.apache.hadoop.io.Text;
+ import org.apache.log4j.Level;
+ import org.apache.log4j.Logger;
  
 +import com.google.common.base.Joiner;
 +
  public class TabletStateChangeIterator extends SkippingIterator {
  
    private static final String SERVERS_OPTION = "servers";


Mime
View raw message