Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a11a021 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a11a021 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a11a021 Branch: refs/heads/master Commit: 5a11a021f65330e316699f42a6df7eba3b63cd53 Parents: 037c138 3bd701b Author: Josh Elser <els...@apache.org> Authored: Sun Dec 11 16:16:06 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Dec 11 16:16:06 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 3 +++ 1 file changed, 3 insertions(+) ----------------------------------------------------------------------
