You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/10/08 16:22:16 UTC

git commit: [CLOUDSTACK-283] Add Nicira NVP calls to the api docs

Updated Branches:
  refs/heads/4.0 c0d4dcf69 -> 098a78a17


[CLOUDSTACK-283] Add Nicira NVP calls to the api docs


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/098a78a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/098a78a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/098a78a1

Branch: refs/heads/4.0
Commit: 098a78a171d3e514860a0cd2ccb1832c41fd4d72
Parents: c0d4dcf
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Oct 8 16:19:19 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Oct 8 16:20:45 2012 +0200

----------------------------------------------------------------------
 build/developer.xml     |    3 ++-
 setup/apidoc/gen_toc.py |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/098a78a1/build/developer.xml
----------------------------------------------------------------------
diff --git a/build/developer.xml b/build/developer.xml
index 3121813..fdda171 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -404,6 +404,7 @@
     <property name="commands.file" location="${dist.dir}/client/conf/commands.properties" /> 
     <property name="commands.ext.file" location="${dist.dir}/client/conf/commands-ext.properties" />
     <property name="commands.vr.file" location="${dist.dir}/client/conf/virtualrouter_commands.properties" />
+    <property name="commands.niciranvp.file" location="${dist.dir}/client/conf/nicira-nvp_commands.properties" />
   
   <echo message="build-apidocs" />
     <exec dir="${apidoc.scripts.dir}" executable="bash" failonerror="true">
@@ -411,7 +412,7 @@
       <arg value="${target.dir}/jar" />
       <arg value="${deps.dir}" />
       <arg value="${dist.dir}" />
-      <arg value="-f ${commands.file},${commands.ext.file},${commands.vr.file}" />
+      <arg value="-f ${commands.file},${commands.ext.file},${commands.vr.file},${commands.niciranvp.file}" />
     </exec>
     <echo message="Result locates at ${dist.dir}/commands.xml" />
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/098a78a1/setup/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --git a/setup/apidoc/gen_toc.py b/setup/apidoc/gen_toc.py
index 1f7fe36..4106531 100644
--- a/setup/apidoc/gen_toc.py
+++ b/setup/apidoc/gen_toc.py
@@ -124,6 +124,7 @@ known_categories = {
     'PrivateGateway': 'VPC',
     'StaticRoute': 'VPC',
     'Tags': 'Resource tags',
+    'NiciraNvpDevice': 'Nicira NVP'
     }