Merge branch 'master' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4c92edbc Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4c92edbc Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4c92edbc Branch: refs/heads/CURATOR-3.0 Commit: 4c92edbc15bb69343089c918ed9dc9e8347f79d7 Parents: 0ed6f66 567cac3 Author: randgalt <[email protected]> Authored: Mon Feb 8 13:21:44 2016 -0500 Committer: randgalt <[email protected]> Committed: Mon Feb 8 13:21:44 2016 -0500 ---------------------------------------------------------------------- curator-x-discovery/src/site/confluence/index.confluence | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------
