Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/4a873834 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a873834 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a873834 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 4a873834945d285b73205442181844a3adc568a8 Parents: 67496e0 d1f3dfe Author: Eric Newton <eric.new...@gmail.com> Authored: Mon Jan 6 18:33:54 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Jan 6 18:33:54 2014 -0500 ---------------------------------------------------------------------- .../core/conf/AccumuloConfiguration.java | 35 +++++++++----- .../core/conf/AccumuloConfigurationTest.java | 48 ++++++++++++++++++++ 2 files changed, 72 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
