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/302617d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/302617d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/302617d0 Branch: refs/heads/master Commit: 302617d047761027924fbeaab2406dcd7a34417a Parents: 6331382 bb73e90 Author: Josh Elser <els...@apache.org> Authored: Thu May 28 21:32:32 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu May 28 21:32:32 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/conf/ServerConfigurationFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
