You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/31 14:36:34 UTC

[27/53] [abbrv] curator git commit: merge problem

merge problem


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/afc206c7
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/afc206c7
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/afc206c7

Branch: refs/heads/persistent-watch
Commit: afc206c7efad8bf3e596b2e9a523cce3b355f035
Parents: 63f8310
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 13:07:10 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 13:07:10 2017 -0500

----------------------------------------------------------------------
 src/site/site.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/afc206c7/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 7761966..4604664 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -76,6 +76,10 @@
             <item name="Schema Support" href="curator-framework/schema.html"/>
         </menu>
 
+        <menu name="Compatibility" inherit="top">
+            <item name="ZooKeeper Versions" href="compatibility.html"/>
+        </menu>
+
         <menu name="Low Level" inherit="top">
             <item name="Framework" href="curator-framework/index.html"/>
             <item name="Utilities" href="utilities.html"/>
@@ -90,7 +94,6 @@
             <item name="Source Code" href="source-repository.html"/>
             <item name="Project Team" href="team-list.html"/>
             <item name="Project Information" href="project-info.html"/>
-            <item name="API Compatibility" href="compatibility.html"/>
             <item name="Javadoc" href="apidocs/index.html"/>
             <item name="Wiki" href="https://cwiki.apache.org/confluence/display/CURATOR"/>
             <item name="Releases" href="https://cwiki.apache.org/confluence/display/CURATOR/Releases"/>