Merge branch '1.5.1-SNAPSHOT' 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/d1f3dfe8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1f3dfe8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1f3dfe8 Branch: refs/heads/master Commit: d1f3dfe8a7cdf09bd4c566b00e6cb651fb8e58f2 Parents: 2781349 f43ba3b Author: John Vines <vi...@apache.org> Authored: Mon Jan 6 18:28:14 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Mon Jan 6 18:28:14 2014 -0500 ---------------------------------------------------------------------- .../core/conf/AccumuloConfiguration.java | 35 +++++++++----- .../core/conf/AccumuloConfigurationTest.java | 48 ++++++++++++++++++++ 2 files changed, 72 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1f3dfe8/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java ----------------------------------------------------------------------
