Return-Path: 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 9684F10F1C for ; Mon, 16 Dec 2013 22:11:21 +0000 (UTC) Received: (qmail 18021 invoked by uid 500); 16 Dec 2013 22:11:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 17994 invoked by uid 500); 16 Dec 2013 22:11:21 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 17920 invoked by uid 99); 16 Dec 2013 22:11: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; Mon, 16 Dec 2013 22:11:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 41DC691DE89; Mon, 16 Dec 2013 22:11:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Mon, 16 Dec 2013 22:11:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/02add1dd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02add1dd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02add1dd Branch: refs/heads/master Commit: 02add1ddde25b98c65c79b4bc5255af87c140749 Parents: 80cf0a6 39b22d3 Author: John Vines Authored: Mon Dec 16 17:11:09 2013 -0500 Committer: John Vines Committed: Mon Dec 16 17:11:09 2013 -0500 ---------------------------------------------------------------------- .../core/client/admin/InstanceOperationsImpl.java | 2 +- .../java/org/apache/accumulo/core/util/AddressUtil.java | 10 +++++++++- .../org/apache/accumulo/core/util/ServerServices.java | 2 +- .../org/apache/accumulo/server/master/LiveTServerSet.java | 2 +- .../accumulo/server/master/state/TServerInstance.java | 4 ++-- .../server/master/state/TabletStateChangeIterator.java | 2 +- .../main/java/org/apache/accumulo/server/util/Admin.java | 3 ++- .../apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 2 +- .../apache/accumulo/monitor/servlets/MasterServlet.java | 6 +++--- .../test/randomwalk/concurrent/StopTabletServer.java | 2 +- 10 files changed, 22 insertions(+), 13 deletions(-) ----------------------------------------------------------------------