Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3b522494 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3b522494 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3b522494 Branch: refs/heads/ui-plugins Commit: 3b52249417780d1fd2a2760c193694cdc67dba85 Parents: cd10b99 482ce5f Author: Pranav Saxena <[email protected]> Authored: Tue Jan 29 14:33:55 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Jan 29 14:33:55 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 +- .../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 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 10 +- tools/cli/cloudmonkey/cloudmonkey.py | 103 +- tools/cli/cloudmonkey/common.py | 46 +- 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 - 19 files changed, 8592 insertions(+), 4764 deletions(-) ----------------------------------------------------------------------
