Updated Branches: refs/heads/ui-plugins 2cb50b17f -> 4a96a200b
Merge branch 'master' into ui-plugins Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4a96a200 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4a96a200 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4a96a200 Branch: refs/heads/ui-plugins Commit: 4a96a200b1132a17968656ffa566ca1b79cae921 Parents: 2cb50b1 606fa9d Author: Brian Federle <[email protected]> Authored: Fri Feb 8 13:09:52 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Fri Feb 8 13:09:52 2013 -0800 ---------------------------------------------------------------------- INSTALL.md | 31 +- .../command/user/config/ListCapabilitiesCmd.java | 2 + .../api/response/CapabilitiesResponse.java | 15 + .../com/cloud/bridge/service/EC2RestServlet.java | 162 +++- .../cloud/bridge/service/EC2SoapServiceImpl.java | 30 +- .../cloud/bridge/service/core/ec2/EC2Engine.java | 71 +- .../service/core/ec2/EC2ImageLaunchPermission.java | 53 + .../service/core/ec2/EC2ModifyImageAttribute.java | 39 +- client/tomcatconf/componentContext.xml.in | 7 +- client/tomcatconf/nonossComponentContext.xml.in | 7 +- packaging/centos63/cloud.spec | 3 +- .../discovery/ApiDiscoveryServiceImpl.java | 4 +- .../cloudstack/discovery/ApiDiscoveryTest.java | 2 +- .../ratelimit/ApiRateLimitServiceImpl.java | 23 +- .../cloudstack/ratelimit/ApiRateLimitTest.java | 8 + .../netapp/src/com/cloud/netapp/NetappManager.java | 3 +- .../src/com/cloud/netapp/NetappManagerImpl.java | 22 +- .../kvm/resource/LibvirtComputingResource.java | 128 +-- .../api/commands/AddBigSwitchVnsDeviceCmd.java | 2 +- .../api/commands/DeleteBigSwitchVnsDeviceCmd.java | 2 +- .../api/commands/ListBigSwitchVnsDevicesCmd.java | 2 +- .../cloud/network/element/BigSwitchVnsElement.java | 2 + scripts/storage/secondary/cloud-install-sys-tmplt | 16 +- server/src/com/cloud/api/ApiServer.java | 17 +- server/src/com/cloud/configuration/Config.java | 8 +- .../src/com/cloud/network/NetworkManagerImpl.java | 17 +- .../network/lb/LoadBalancingRulesManager.java | 10 +- .../src/com/cloud/server/ManagementServerImpl.java | 408 ++++++- server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +- setup/db/db/schema-40to410.sql | 4 + .../appliance/definitions/systemvmtemplate/LICENSE | 21 + .../appliance/definitions/systemvmtemplate/base.sh | 45 + .../definitions/systemvmtemplate/cleanup.sh | 39 + .../systemvmtemplate/cloudstack-packages.sh | 90 ++ .../definitions/systemvmtemplate/config.dat | 878 +++++++++++++++ .../definitions/systemvmtemplate/definition.rb | 8 +- .../definitions/systemvmtemplate/postinstall.sh | 48 +- .../definitions/systemvmtemplate/preseed.cfg | 6 +- .../definitions/systemvmtemplate/zerodisk.sh | 20 + ui/scripts/instanceWizard.js | 24 +- ui/scripts/system.js | 46 +- 41 files changed, 1918 insertions(+), 436 deletions(-) ----------------------------------------------------------------------
