Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ef2e31af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef2e31af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ef2e31af Branch: refs/heads/master Commit: ef2e31af3d6503e31e79610cd49de9ce0190f6f6 Parents: c55fe3e 67c8b2b Author: Dave Marion <dlmar...@hotmail.com> Authored: Wed Apr 29 18:08:36 2015 -0400 Committer: Dave Marion <dlmar...@hotmail.com> Committed: Wed Apr 29 18:08:36 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef2e31af/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java ----------------------------------------------------------------------
