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 D05DD18911 for ; Mon, 2 Nov 2015 00:51:50 +0000 (UTC) Received: (qmail 95765 invoked by uid 500); 2 Nov 2015 00:51:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 95644 invoked by uid 500); 2 Nov 2015 00:51:50 -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 95590 invoked by uid 99); 2 Nov 2015 00:51:50 -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; Mon, 02 Nov 2015 00:51:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 99AADDFE60; Mon, 2 Nov 2015 00:51:50 +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: Mon, 02 Nov 2015 00:51:52 -0000 Message-Id: <6df2c91aaeb144139107b76b385e94e3@git.apache.org> In-Reply-To: <0d989be284be43849593ac52ec73882a@git.apache.org> References: <0d989be284be43849593ac52ec73882a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/928864de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/928864de Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/928864de Branch: refs/heads/master Commit: 928864dede16def5b1e6c68601cfa6417f36081e Parents: 31a4a7e c996151 Author: Josh Elser Authored: Sun Nov 1 19:51:41 2015 -0500 Committer: Josh Elser Committed: Sun Nov 1 19:51:41 2015 -0500 ---------------------------------------------------------------------- .../server/master/balancer/ChaoticLoadBalancer.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ----------------------------------------------------------------------