Return-Path: 
 <commits-return-14733-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 36FFB176F0
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 24 Feb 2015 21:19:20 +0000 (UTC)
Received: (qmail 894 invoked by uid 500); 24 Feb 2015 21:19:07 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 795 invoked by uid 500); 24 Feb 2015 21:19:07 -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 452 invoked by uid 99); 24 Feb 2015 21:19:07 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 21:19:07 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 21807E0E32; Tue, 24 Feb 2015 21:19:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ecn@apache.org
To: commits@accumulo.apache.org
Date: Tue, 24 Feb 2015 21:19:16 -0000
Message-Id: <81ba686f09584619b9cc766fc4b5b21d@git.apache.org>
In-Reply-To: <6edc0775f2944244986450e4369d5dd7@git.apache.org>
References: <6edc0775f2944244986450e4369d5dd7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [10/11] accumulo git commit: Merge branch 'master' of
 https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


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

Branch: refs/heads/master
Commit: 8459de5907fc366bb30ab4f75f6cf227c3400c71
Parents: a8c3587 8eeab8a
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Feb 24 15:35:23 2015 -0500
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Feb 24 15:35:23 2015 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/rpc/ThriftUtil.java   | 8 +++++++-
 .../src/main/java/org/apache/accumulo/master/Master.java     | 6 +++++-
 .../org/apache/accumulo/master/tableOps/DeleteTable.java     | 8 --------
 .../test/java/org/apache/accumulo/test/WaitForBalanceIT.java | 7 ++++++-
 4 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8459de59/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java
index 562c584,9277d8b..16cdd54
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@@ -1535,13 -1534,10 +1535,17 @@@ public class Master extends AccumuloSer
  
    @Override
    public Collection<KeyExtent> migrations() {
-     return migrations.keySet();
+     Set<KeyExtent> migrationKeys = new HashSet<KeyExtent>();
+     synchronized (migrations) {
+       migrationKeys.addAll(migrations.keySet());
+     }
+     return migrationKeys;
    }
 +
 +  @Override
 +  public Set<TServerInstance> shutdownServers() {
 +    synchronized (serversToShutdown) {
 +      return new HashSet<TServerInstance>(serversToShutdown);
 +    }
 +  }
  }