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/master Commit: 65aaddd1703f170bacec3b3f35f4d3ff59ff2c7d Parents: a18e469 f43ba3b Author: Eric Newton <eric.new...@gmail.com> Authored: Mon Jan 6 18:34:05 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> 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(-) ----------------------------------------------------------------------
