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 D323211078 for ; Sat, 24 May 2014 22:32:12 +0000 (UTC) Received: (qmail 53269 invoked by uid 500); 24 May 2014 22:32:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 53158 invoked by uid 500); 24 May 2014 22:32:12 -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 53079 invoked by uid 99); 24 May 2014 22:32:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 May 2014 22:32:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 48D2A9A40D9; Sat, 24 May 2014 22:32:12 +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: Sat, 24 May 2014 22:32:18 -0000 Message-Id: <74436d0e53da4025962e0c493dc5f35b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c17eb16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c17eb16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c17eb16 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 7c17eb169c2ea367a3ce6bd67787600ff8fb3ffd Parents: c9c3fdd 9fbc24a Author: Josh Elser Authored: Sat May 24 18:22:04 2014 -0400 Committer: Josh Elser Committed: Sat May 24 18:22:04 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c17eb16/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java ----------------------------------------------------------------------