Return-Path: 
 <commits-return-11620-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2678A1026D
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu,  5 Jun 2014 18:48:21 +0000 (UTC)
Received: (qmail 85928 invoked by uid 500); 5 Jun 2014 18:48:21 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 85828 invoked by uid 500); 5 Jun 2014 18:48:21 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 85686 invoked by uid 99); 5 Jun 2014 18:48:21 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jun 2014 18:48:21 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C0D4994C5ED; Thu,  5 Jun 2014 18:48:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Date: Thu, 05 Jun 2014 18:48:24 -0000
Message-Id: <cad3b4c7af324fd991b1d10484e865b4@git.apache.org>
In-Reply-To: <cd0f01a0e38a4396a4ce06875c719b7f@git.apache.org>
References: <cd0f01a0e38a4396a4ce06875c719b7f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [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 <elserj@apache.org>
Authored: Thu Jun 5 13:32:51 2014 -0400
Committer: Josh Elser <elserj@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();