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 3BB17107B1 for ; Mon, 6 Jan 2014 23:33:55 +0000 (UTC) Received: (qmail 19783 invoked by uid 500); 6 Jan 2014 23:33:55 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19742 invoked by uid 500); 6 Jan 2014 23:33:55 -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 19707 invoked by uid 99); 6 Jan 2014 23:33:55 -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, 06 Jan 2014 23:33:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BDC5B380DA; Mon, 6 Jan 2014 23:33:54 +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: Mon, 06 Jan 2014 23:34:01 -0000 Message-Id: <397db5dee664406f9670f64bb5b7b40a@git.apache.org> In-Reply-To: <4dbc1d4e2aaa4fc1a7245f1227c1aa50@git.apache.org> References: <4dbc1d4e2aaa4fc1a7245f1227c1aa50@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65aaddd1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65aaddd1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65aaddd1 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 65aaddd1703f170bacec3b3f35f4d3ff59ff2c7d Parents: a18e469 f43ba3b Author: Eric Newton Authored: Mon Jan 6 18:34:05 2014 -0500 Committer: Eric Newton Committed: Mon Jan 6 18:34:05 2014 -0500 ---------------------------------------------------------------------- .../core/conf/AccumuloConfiguration.java | 35 +++++++++----- .../core/conf/AccumuloConfigurationTest.java | 48 ++++++++++++++++++++ 2 files changed, 72 insertions(+), 11 deletions(-) ----------------------------------------------------------------------