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 01FCF10ECB for ; Tue, 28 Jan 2014 18:46:58 +0000 (UTC) Received: (qmail 60737 invoked by uid 500); 28 Jan 2014 18:46:57 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 60653 invoked by uid 500); 28 Jan 2014 18:46:56 -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 60638 invoked by uid 99); 28 Jan 2014 18:46:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jan 2014 18:46:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F1ACA90A424; Tue, 28 Jan 2014 18:46:55 +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, 28 Jan 2014 18:46:56 -0000 Message-Id: <5d09071825b242e9aaccd11bdee2575a@git.apache.org> 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/25948e6b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25948e6b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25948e6b Branch: refs/heads/master Commit: 25948e6b1212211670d6d883a49ba8fdfda7d644 Parents: 6011108 f5c35b9 Author: Eric Newton Authored: Tue Jan 28 13:47:13 2014 -0500 Committer: Eric Newton Committed: Tue Jan 28 13:47:13 2014 -0500 ---------------------------------------------------------------------- .../master/state/MetaDataTableScanner.java | 11 +- .../master/state/TabletLocationState.java | 8 +- .../accumulo/master/TabletGroupWatcher.java | 63 +++++++- .../test/MasterRepairsDualAssignmentIT.java | 146 +++++++++++++++++++ 4 files changed, 216 insertions(+), 12 deletions(-) ----------------------------------------------------------------------