You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/03 18:42:16 UTC

git commit: updated refs/heads/master to db655ae

Updated Branches:
  refs/heads/master 767ed065c -> db655ae8c


CLOUDSTACK-2810: Include new vmware APIs in discovery

Discovery plugin will detect APIs from pluggable services and map them
to those in commands.properties. Including the latter to complete the
mapping so listApis now returns these APIs.

Also included fix for API docs.

Signed-off-by: Prasanna Santhanam <ts...@apache.org>


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

Branch: refs/heads/master
Commit: db655ae8c76753fb63ac87d82a337159ec5d3517
Parents: 767ed06
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Jun 3 22:11:03 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jun 3 22:11:03 2013 +0530

----------------------------------------------------------------------
 client/tomcatconf/commands.properties.in |    4 ++++
 tools/apidoc/gen_toc.py                  |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db655ae8/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index ad47eeb..5eccf36 100644
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -265,6 +265,10 @@ addSecondaryStorage=1
 updateHostPassword=1
 releaseHostReservation=1
 
+#### VmWare DC
+addVmwareDc=1
+removeVmwareDc=1
+
 #### volume commands
 attachVolume=15
 uploadVolume=15

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db655ae8/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index cef50ee..3dd526a 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -86,6 +86,7 @@ known_categories = {
     'Pod': 'Pod',
     'PublicIpRange': 'Network',
     'Zone': 'Zone',
+    'Vmware' : 'Zone',
     'NetworkOffering': 'Network Offering',
     'NetworkACL': 'Network ACL',
     'Network': 'Network',