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/315ccd92 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/315ccd92 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/315ccd92 Branch: refs/heads/master Commit: 315ccd921cd72409a2eb11fad5c2b045e43567de Parents: 3dc9b37 5a11a02 Author: Josh Elser <els...@apache.org> Authored: Sun Dec 11 16:45:22 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Dec 11 16:45:22 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/315ccd92/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java ----------------------------------------------------------------------
