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/1d58ee19 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d58ee19 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d58ee19 Branch: refs/heads/master Commit: 1d58ee19c67f7df4d992ab8bd5b15162cad18e75 Parents: b6344e8 e2552a8 Author: Josh Elser <els...@apache.org> Authored: Wed Apr 2 14:42:51 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Apr 2 14:42:51 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/cluster/AccumuloConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
