Merge branch 'master' into regions
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d3089ba2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d3089ba2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d3089ba2 Branch: refs/heads/master Commit: d3089ba2a56845be9c33fbd74e4c3d9872f15fb0 Parents: 158ee8b 482ce5f Author: Kishan Kavala <[email protected]> Authored: Tue Jan 29 11:50:49 2013 +0530 Committer: Kishan Kavala <[email protected]> Committed: Tue Jan 29 11:50:49 2013 +0530 ---------------------------------------------------------------------- LICENSE | 3569 +------------ NOTICE | 618 +--- .../org/apache/cloudstack/api/ApiErrorCode.java | 2 +- .../api/command/user/vm/DeployVMCmd.java | 3 +- .../api/command/user/vm/UpgradeVMCmd.java | 4 +- console-proxy/pom.xml | 18 +- .../resource/NfsSecondaryStorageResource.java | 3 +- docs/en-US/network-rate.xml | 144 + docs/en-US/offerings.xml | 1 + docs/en-US/vmware-install.xml | 550 ++- .../kvm/resource/LibvirtComputingResource.java | 2 +- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 10 +- setup/db/create-schema.sql | 1 + setup/db/db/schema-40to410.sql | 2 + tools/cli/cloudmonkey/cachegen.py | 11 +- tools/cli/cloudmonkey/cloudmonkey.py | 148 +- tools/cli/cloudmonkey/common.py | 57 +- tools/cli/cloudmonkey/lexer.py | 121 + tools/cli/setup.py | 2 +- tools/whisker/LICENSE | 4241 +++++++++++++++ tools/whisker/NOTICE | 690 +++ tools/whisker/descriptor-for-packaging.xml | 2952 ++++++++++ tools/whisker/descriptor.xml | 295 - ui/scripts/ui-custom/instanceWizard.js | 15 +- ui/scripts/ui-custom/recurringSnapshots.js | 3 +- ui/scripts/ui/dialog.js | 335 +- 27 files changed, 8840 insertions(+), 4959 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d3089ba2/setup/db/create-schema.sql ----------------------------------------------------------------------
