Updated Branches: refs/heads/master 27e9cdbec -> 54d7a10b9
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/54d7a10b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/54d7a10b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/54d7a10b Branch: refs/heads/master Commit: 54d7a10b99591c735f0c57eb9947fcbb8ed5fa73 Parents: ecf2cd5 27e9cdb Author: David Nalley <[email protected]> Authored: Wed Jul 4 18:45:34 2012 -0400 Committer: David Nalley <[email protected]> Committed: Wed Jul 4 18:45:34 2012 -0400 ---------------------------------------------------------------------- build.xml | 2 +- build/build-cloud-plugins.xml | 9 +- build/build-clouddev.xml | 96 -- build/build-devcloud.xml | 98 ++ client/tomcatconf/components.xml.in | 2 + .../com/cloud/network/CiscoNexusVSMDeviceVO.java | 2 +- .../hypervisor/xen/resource/XcpOssResource.java | 39 + .../elastic-loadbalancer/.classpath | 11 + .../network-elements/elastic-loadbalancer/.project | 17 + .../elastic-loadbalancer/build.xml | 129 ++ .../src/com/cloud/network/ElasticLbVmMapVO.java | 101 ++ .../element/ElasticLoadBalancerElement.java | 199 +++ .../network/lb/ElasticLoadBalancerManager.java | 41 + .../network/lb/ElasticLoadBalancerManagerImpl.java | 990 +++++++++++++++ .../cloud/network/lb/dao/ElasticLbVmMapDao.java | 37 + .../network/lb/dao/ElasticLbVmMapDaoImpl.java | 134 ++ scripts/vm/hypervisor/xenserver/xcposs/vmops | 15 +- .../configuration/ConfigurationManagerImpl.java | 1 + .../configuration/DefaultComponentLibrary.java | 4 - .../consoleproxy/ConsoleProxyManagerImpl.java | 15 +- server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 41 +- server/src/com/cloud/network/ElasticLbVmMapVO.java | 101 -- .../element/ElasticLoadBalancerElement.java | 199 --- .../network/lb/ElasticLoadBalancerManager.java | 41 - .../network/lb/ElasticLoadBalancerManagerImpl.java | 990 --------------- .../network/lb/LoadBalancingRulesManagerImpl.java | 11 +- .../cloud/network/lb/dao/ElasticLbVmMapDao.java | 37 - .../network/lb/dao/ElasticLbVmMapDaoImpl.java | 134 -- .../resourcelimit/ResourceLimitManagerImpl.java | 27 +- .../secondary/SecondaryStorageManagerImpl.java | 2 +- setup/db/deploy-db-clouddev.sh | 20 + setup/db/deploy-db-simulator.sh | 46 +- tools/marvin/marvin/configGenerator.py | 1 + tools/marvin/marvin/deployDataCenter.py | 11 +- ui/scripts/accounts.js | 9 +- ui/scripts/storage.js | 2 +- 36 files changed, 1956 insertions(+), 1658 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/54d7a10b/tools/marvin/marvin/configGenerator.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/54d7a10b/tools/marvin/marvin/deployDataCenter.py ----------------------------------------------------------------------
