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/42d9c3fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/42d9c3fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/42d9c3fb Branch: refs/heads/api_refactoring Commit: 42d9c3fbb14ef3465a1be1a37bce570a77bc1597 Parents: 3e6435b 42f3804 Author: Pranav Saxena <[email protected]> Authored: Fri Jan 4 18:22:38 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Fri Jan 4 18:22:38 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/api/commands/ListS3sCmd.java | 37 ---- awsapi/pom.xml | 26 +++ build/package.xml | 4 + client/tomcatconf/commands.properties.in | 2 +- docs/en-US/changing-secondary-storage-servers.xml | 2 +- docs/en-US/changing-secondary-storage-serversp.xml | 36 ---- docs/en-US/configure-xenserver-dom-memory.xml | 29 --- plugins/hypervisors/vmware/pom.xml | 6 +- .../cloud/network/element/NiciraNvpElement.java | 3 +- .../network/guru/NiciraNvpGuestNetworkGuru.java | 7 +- .../src/com/cloud/network/nicira/NiciraNvpApi.java | 2 +- .../network/element/NiciraNvpElementTest.java | 119 ++++++++++++ .../guru/NiciraNvpGuestNetworkGuruTest.java | 114 ++++++++++++ scripts/vm/network/vnet/modifyvlan.sh | 2 + .../configuration/ConfigurationManagerImpl.java | 108 +++++++++-- .../com/cloud/network/guru/GuestNetworkGuru.java | 20 +-- .../src/com/cloud/server/ManagementServerImpl.java | 26 +++ .../src/com/cloud/storage/dao/VMTemplateDao.java | 4 + .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 140 +++++++++++++++ server/src/com/cloud/storage/s3/S3ManagerImpl.java | 5 - setup/db/db/schema-40to410.sql | 5 + test/integration/component/test_snapshots.py | 6 +- tools/marvin/marvin/cloudstackConnection.py | 1 - tools/marvin/marvin/configGenerator.py | 11 ++ tools/marvin/marvin/deployDataCenter.py | 8 +- ui/scripts/accounts.js | 1 + utils/src/com/cloud/utils/db/DbUtil.java | 59 ++++++ vmware-base/pom.xml | 6 +- 28 files changed, 624 insertions(+), 165 deletions(-) ----------------------------------------------------------------------
