You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2015/05/22 06:20:05 UTC
[9/9] git commit: updated refs/heads/master to 1cd2e9b
Merge branch 'CLOUDSTACK-8301' of https://github.com/apache/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1cd2e9bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1cd2e9bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1cd2e9bc
Branch: refs/heads/master
Commit: 1cd2e9bc440ec571d2e8f8c8a61fa04399469875
Parents: 84266b1 2148dca
Author: Koushik Das <ko...@apache.org>
Authored: Fri May 22 09:47:59 2015 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri May 22 09:47:59 2015 +0530
----------------------------------------------------------------------
api/src/com/cloud/dc/DataCenter.java | 4 -
.../classes/resources/messages.properties | 3 +-
.../cloud/service/dao/ServiceOfferingDao.java | 8 +
.../service/dao/ServiceOfferingDaoImpl.java | 53 ++
.../lb/ElasticLoadBalancerManagerImpl.java | 19 +-
.../network/lb/LoadBalanceRuleHandler.java | 16 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 26 +-
.../InternalLBVMManagerTest.java | 8 +-
.../InternalLBVMServiceTest.java | 10 +-
server/src/com/cloud/configuration/Config.java | 1 -
.../configuration/ConfigurationManagerImpl.java | 48 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 38 +-
.../deploy/DeploymentPlanningManagerImpl.java | 36 +-
.../VirtualNetworkApplianceManagerImpl.java | 15 +-
.../com/cloud/storage/StorageManagerImpl.java | 13 +-
.../deployment/RouterDeploymentDefinition.java | 16 +-
.../RouterDeploymentDefinitionBuilder.java | 4 +
.../VpcRouterDeploymentDefinition.java | 6 +-
.../element/VirtualRouterElementTest.java | 6 +-
.../RouterDeploymentDefinitionTest.java | 13 +-
.../RouterDeploymentDefinitionTestBase.java | 7 +
.../VpcRouterDeploymentDefinitionTest.java | 14 +-
.../SecondaryStorageManagerImpl.java | 38 +-
.../test_zone_level_local_storage_setting.py | 734 +++++++++++++++++++
ui/dictionary2.jsp | 3 +-
ui/scripts/zoneWizard.js | 92 ++-
26 files changed, 1035 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cd2e9bc/ui/scripts/zoneWizard.js
----------------------------------------------------------------------