Merge branch 'master' into vim51_win8
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/801e5269 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/801e5269 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/801e5269 Branch: refs/heads/vim51_win8 Commit: 801e5269ea23c00a21df61343ed8af12bba22ff1 Parents: bcaac32 6f19895 Author: Min Chen <[email protected]> Authored: Thu Feb 28 14:25:26 2013 -0800 Committer: Min Chen <[email protected]> Committed: Thu Feb 28 14:25:26 2013 -0800 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/ScaleVmAnswer.java | 28 ++ api/src/com/cloud/agent/api/ScaleVmCommand.java | 113 +++++ api/src/org/apache/cloudstack/api/ACL.java | 4 + .../api/command/user/vm/DeployVMCmd.java | 4 +- client/WEB-INF/web.xml | 2 +- client/tomcatconf/classpath.conf.in | 24 +- client/tomcatconf/componentContext.xml.in | 1 - client/tomcatconf/nonossComponentContext.xml.in | 8 +- debian/control | 6 +- debian/rules | 14 +- docs/en-US/vlan-provisioning.xml | 23 +- .../entity/api/VirtualMachineEntityFactory.java | 3 +- .../platform/orchestration/CloudOrchestrator.java | 4 +- packaging/centos63/cloud.spec | 4 + .../hypervisor/vmware/VmwareServerDiscoverer.java | 13 +- server/src/com/cloud/api/ApiDispatcher.java | 20 +- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 11 +- .../com/cloud/server/ConfigurationServerImpl.java | 22 +- .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 102 ++++-- .../dao/RandomlyIncreasingVMInstanceDaoImpl.java | 36 -- setup/db/db/schema-40to410.sql | 3 +- tools/appliance/build.sh | 34 +- .../definitions/systemvmtemplate/cleanup.sh | 1 + .../definitions/systemvmtemplate/definition.rb | 2 +- .../definitions/systemvmtemplate/postinstall.sh | 13 +- .../definitions/systemvmtemplate/zerodisk.sh | 3 +- ui/scripts/docs.js | 14 + ui/scripts/network.js | 5 + ui/scripts/system.js | 339 +++++++++++++-- ui/scripts/ui-custom/regions.js | 17 + ui/scripts/vpc.js | 7 + ui/scripts/zoneWizard.js | 231 ++++++++++- 32 files changed, 911 insertions(+), 200 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/801e5269/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/801e5269/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/801e5269/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/801e5269/setup/db/db/schema-40to410.sql ----------------------------------------------------------------------
