Merge branch 'master' of https://github.com/apache/stratos into pr-457
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/83e94cf0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/83e94cf0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/83e94cf0 Branch: refs/heads/master Commit: 83e94cf05de128bab6f8cf97a1b3518fcd61e711 Parents: aad961d aad319c Author: lasinducharith <[email protected]> Authored: Thu Sep 10 12:06:09 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Thu Sep 10 12:06:09 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 38 +-- .../services/impl/AutoscalerServiceImpl.java | 2 +- .../config/CloudControllerConfig.java | 4 - .../parser/CloudControllerConfigParser.java | 21 +- .../config/parser/IaasProviderConfigParser.java | 12 +- .../controller/iaases/PartitionValidator.java | 4 +- .../iaases/kubernetes/KubernetesIaas.java | 2 +- .../messaging/topology/TopologyBuilder.java | 34 +- .../impl/CloudControllerServiceUtil.java | 5 +- .../util/CloudControllerConstants.java | 140 +-------- .../controller/util/CloudControllerUtil.java | 58 +--- .../iaas/statistics/MockHealthStatistics.java | 3 +- .../cartridge.agent/healthstats.py | 4 + .../rest/endpoint/api/StratosApiV41.java | 4 +- .../rest/endpoint/api/StratosApiV41Utils.java | 26 ++ .../util/converter/ObjectConverter.java | 1 + dependencies/org.wso2.carbon.ui/pom.xml | 4 +- .../test/ADCMTAppTenantUserTest.java | 3 +- .../test/ADCMTAppTest.java | 3 +- .../python.cartridge.agent/test/ADCTest.java | 2 +- .../test/AgentStartupTest.java | 3 +- products/python-cartridge-agent/pom.xml | 2 +- .../modules/distribution/src/assembly/bin.xml | 142 +++++---- .../distribution/src/bin/add_entry_zone_file.sh | 70 ----- .../src/bin/git-folder-structure.sh | 67 ---- .../distribution/src/bin/manage-git-repo.sh | 138 --------- .../src/bin/remove_entry_zone_file.sh | 75 ----- .../distribution/src/bin/set-mysql-password.sh | 65 ---- .../modules/distribution/src/bin/stratos.bat | 172 ----------- .../modules/distribution/src/bin/stratos.sh | 307 ------------------- .../distribution/src/bin/update-instance.sh | 54 ---- .../distribution/src/main/bin/stratos.bat | 172 +++++++++++ .../distribution/src/main/bin/stratos.sh | 307 +++++++++++++++++++ products/stratos/modules/integration/pom.xml | 8 +- .../application/SingleClusterScalingTest.java | 114 +++++++ 35 files changed, 811 insertions(+), 1255 deletions(-) ----------------------------------------------------------------------
