Merge branch 'master' into bvt
Conflicts:
client/pom.xml
Signed-off-by: Prasanna Santhanam <t...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/392e92bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/392e92bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/392e92bb
Branch: refs/heads/bvt
Commit: 392e92bbd4bc57b04f5d175863f500daef5f2bf9
Parents: 6637b8f d437cb6
Author: Prasanna Santhanam <t...@apache.org>
Authored: Thu Mar 28 15:45:29 2013 +0530
Committer: Prasanna Santhanam <t...@apache.org>
Committed: Thu Mar 28 15:45:29 2013 +0530
----------------------------------------------------------------------
.../routing/GlobalLoadBalancerConfigAnswer.java | 27 +
.../routing/GlobalLoadBalancerConfigCommand.java | 100 ++
.../agent/api/routing/SiteLoadBalancerConfig.java | 121 ++
api/src/com/cloud/async/AsyncJob.java | 7 +-
api/src/com/cloud/event/EventTypes.java | 6 +
.../cloud/region/ha/GlobalLoadBalancerRule.java | 89 ++
.../region/ha/GlobalLoadBalancingRulesService.java | 47 +
.../org/apache/cloudstack/api/ApiConstants.java | 8 +
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 1 +
.../apache/cloudstack/api/ResponseGenerator.java | 39 +-
.../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 128 ++
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 179 +++
.../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 108 ++
.../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 92 ++
.../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 125 ++
.../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 96 ++
.../api/response/GlobalLoadBalancerResponse.java | 125 ++
api/src/org/apache/cloudstack/region/Region.java | 49 +
client/pom.xml | 5 +
client/tomcatconf/commands.properties.in | 8 +
docs/en-US/Book_Info.xml | 39 +-
docs/en-US/Installation_Guide.xml | 74 +-
docs/en-US/add-clusters-vsphere.xml | 103 ++-
docs/en-US/images/add-cluster.png | Bin 46302 -> 35697 bytes
docs/en-US/images/dvswitch-config.png | Bin 0 -> 41955 bytes
docs/en-US/images/dvswitchconfig.png | Bin 0 -> 38642 bytes
docs/en-US/vmware-cluster-config-dvswitch.xml | 192 +++
docs/en-US/vmware-install.xml | 515 +++++---
packaging/centos63/cloud.spec | 53 +
.../element/F5ExternalLoadBalancerElement.java | 46 +-
.../api/commands/AddNetscalerLoadBalancerCmd.java | 41 +-
.../cloud/network/element/NetscalerElement.java | 155 ++-
.../cloud/network/resource/NetscalerResource.java | 660 +++++++++-
server/src/com/cloud/api/ApiResponseHelper.java | 36 +-
server/src/com/cloud/api/ApiServer.java | 149 +--
server/src/com/cloud/configuration/Config.java | 8 +-
.../network/ExternalLoadBalancerDeviceManager.java | 4 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 51 +-
.../network/dao/ExternalLoadBalancerDeviceDao.java | 11 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 25 +-
.../network/dao/ExternalLoadBalancerDeviceVO.java | 51 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 117 +--
.../src/com/cloud/server/ManagementServerImpl.java | 328 ++---
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 40 +-
.../cloudstack/region/RegionServiceProvider.java | 25 +
.../src/org/apache/cloudstack/region/RegionVO.java | 19 +
.../region/gslb/GlobalLoadBalancerDaoImpl.java | 58 +
.../gslb/GlobalLoadBalancerLbRuleMapDao.java | 30 +
.../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java | 63 +
.../region/gslb/GlobalLoadBalancerLbRuleMapVO.java | 83 ++
.../region/gslb/GlobalLoadBalancerRuleDao.java | 28 +
.../region/gslb/GlobalLoadBalancerRuleVO.java | 183 +++
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 590 +++++++++
.../region/gslb/GslbServiceProvider.java | 36 +
.../GlobalLoadBalancingRulesServiceImplTest.java | 974 +++++++++++++++
setup/db/db/schema-410to420.sql | 38 +
ui/scripts/globalSettings.js | 60 +
ui/scripts/system.js | 3 +-
58 files changed, 5334 insertions(+), 914 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392e92bb/client/pom.xml
----------------------------------------------------------------------
diff --cc client/pom.xml
index 4e90088,23892e1..641a43f
--- a/client/pom.xml
+++ b/client/pom.xml
@@@ -215,6 -215,16 +215,11 @@@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-hypervisor-simulator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-storage-volume-default</artifactId>
<version>${project.version}</version>
