Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/79548739 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/79548739 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/79548739 Branch: refs/heads/master Commit: 795487392b685487d35357370808bc5a627bdc50 Parents: 434a88a 7dc726e Author: Christopher Tubbs <ctubb...@apache.org> Authored: Sat Aug 13 22:35:09 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Sat Aug 13 22:35:09 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/init/Initialize.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/79548739/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ----------------------------------------------------------------------
