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 2014/06/05 20:48:24 UTC
[5/8] git commit: ACCUMULO-2857 Messed up the merge
ACCUMULO-2857 Messed up the merge
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ebf6179
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ebf6179
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ebf6179
Branch: refs/heads/ACCUMULO-378
Commit: 8ebf6179433de4ad50c21f51a4c0c10520f34d31
Parents: 38ff000
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 13:32:51 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 13:32:51 2014 -0400
----------------------------------------------------------------------
.../accumulo/server/master/balancer/TableLoadBalancerTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8ebf6179/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index 3642bc3..5c134a5 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -136,7 +136,6 @@ public class TableLoadBalancerTest {
String t1Id = tops.tableIdMap().get("t1"), t2Id = tops.tableIdMap().get("t2"), t3Id = tops.tableIdMap().get("t3");
state = new TreeMap<TServerInstance,TabletServerStatus>();
TServerInstance svr = mkts("10.0.0.1", "0x01020304");
- state.put(svr, status("t1", 10, "t2", 10, "t3", 10));
state.put(svr, status(t1Id, 10, t2Id, 10, t3Id, 10));
Set<KeyExtent> migrations = Collections.emptySet();