Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cd82738 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cd82738 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9cd82738 Branch: refs/heads/master Commit: 9cd82738e5a1b07c709c4407d977955eed58b91f Parents: acf6082 25d9b28 Author: Josh Elser <els...@apache.org> Authored: Wed May 20 22:26:29 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 20 22:26:29 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9cd82738/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ----------------------------------------------------------------------
