Merge branch '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/fb7534b4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb7534b4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb7534b4 Branch: refs/heads/master Commit: fb7534b4dd40071ebe49ed992e22cb8f00aa0460 Parents: b48b13a f5bcee7 Author: Josh Elser <els...@apache.org> Authored: Mon Apr 28 23:25:12 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Apr 28 23:25:12 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/cluster/AccumuloConfig.java | 5 +++++ 1 file changed, 5 insertions(+) ----------------------------------------------------------------------
