Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1696e8cb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1696e8cb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1696e8cb Branch: refs/heads/master Commit: 1696e8cb161376651d0276c05d655215c55a1067 Parents: 1526547 202da41 Author: Wei Zhou <w.z...@leaseweb.com> Authored: Wed Jun 5 14:29:06 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Wed Jun 5 14:29:06 2013 +0200 ---------------------------------------------------------------------- .../org/apache/cloudstack/api/ApiConstants.java | 3 + .../response/HypervisorCapabilitiesResponse.java | 32 ++ client/tomcatconf/classpath.conf.in | 8 - .../src/com/cloud/alert/dao/AlertDaoImpl.java | 2 +- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 209 +++++++++- packaging/centos63/cloud.spec | 3 + .../network/cisco/CiscoVnmcConnectionImpl.java | 2 +- .../cloud/network/element/CiscoVnmcElement.java | 2 +- .../cloud/network/resource/CiscoVnmcResource.java | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 3 + .../src/com/cloud/server/ManagementServerImpl.java | 15 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 8 +- test/integration/smoke/test_internal_lb.py | 351 ++++++--------- tools/marvin/marvin/integration/lib/base.py | 98 ++++- ui/scripts/projects.js | 3 + ui/scripts/ui-custom/projects.js | 25 + ui/scripts/vpc.js | 31 ++- 17 files changed, 549 insertions(+), 248 deletions(-) ----------------------------------------------------------------------
