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/d82aa229 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d82aa229 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d82aa229 Branch: refs/heads/master Commit: d82aa229ba16b1702f000908ffe00b93f3691154 Parents: 8b8c615 766eb22 Author: Josh Elser <els...@apache.org> Authored: Fri Jan 3 17:47:06 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Jan 3 17:47:06 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/init/Initialize.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ----------------------------------------------------------------------