Updated Branches: refs/heads/object_store 1c448cd6e -> cd2d066fd
Add new api to gen_toc.py to avoid api-doc build error. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd2d066f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd2d066f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd2d066f Branch: refs/heads/object_store Commit: cd2d066fdad50b01bacc7d2e9a20b14978255c95 Parents: 1c448cd Author: Min Chen <[email protected]> Authored: Thu Apr 11 11:34:33 2013 -0700 Committer: Min Chen <[email protected]> Committed: Thu Apr 11 11:34:33 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/commands.properties.in | 2 -- .../src/com/cloud/server/ManagementServerImpl.java | 7 +++++-- tools/apidoc/gen_toc.py | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd2d066f/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index d282849..002da87 100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -245,8 +245,6 @@ listS3s=1 addImageStore=1 listImageStores=1 deleteImageStore=1 -enableImageStore=1 - #### host commands addHost=3 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd2d066f/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index af77ba5..ee0fbdb 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -466,11 +466,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe public ManagementServerImpl() { setRunLevel(ComponentLifecycle.RUN_LEVEL_APPLICATION_MAINLOOP); } - + public List<UserAuthenticator> getUserAuthenticators() { return _userAuthenticators; } - + public void setUserAuthenticators(List<UserAuthenticator> authenticators) { _userAuthenticators = authenticators; } @@ -2301,6 +2301,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(AssignToGlobalLoadBalancerRuleCmd.class); cmdList.add(RemoveFromGlobalLoadBalancerRuleCmd.class); cmdList.add(ListStorageProvidersCmd.class); + cmdList.add(AddImageStoreCmd.class); + cmdList.add(ListImageStoresCmd.class); + cmdList.add(DeleteImageStoreCmd.class); return cmdList; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd2d066f/tools/apidoc/gen_toc.py ---------------------------------------------------------------------- diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py index e41e883..07ef0f5 100644 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@ -138,6 +138,9 @@ known_categories = { 'addIpToNic': 'Nic', 'removeIpFromNic': 'Nic', 'listNics':'Nic', + 'addImageStore': 'Image Store', + 'listImageStores': 'Image Store', + 'deleteImageStore': 'Image Store', }
