Merge branch 'stratos-4.1.x' of https://github.com/apache/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cedd128d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cedd128d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cedd128d Branch: refs/heads/stratos-4.1.x Commit: cedd128dde17e0e718fc671be34e4b6a88c1fe88 Parents: 1ca22f3 0b913eb Author: Dinithi <[email protected]> Authored: Wed Sep 16 09:19:06 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Sep 16 09:19:06 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/registry/RegistryManager.java | 5 +- .../controller/registry/RegistryManager.java | 17 ++--- .../manager/registry/RegistryManager.java | 17 ++--- .../service/registry/MetadataApiRegistry.java | 68 ++++++++++++-------- .../mock/iaas/persistence/RegistryManager.java | 16 +++-- .../cartridge.agent/cartridge.agent/agent.py | 5 +- .../rest/endpoint/api/StratosApiV41Utils.java | 14 ++-- dependencies/org.wso2.carbon.ui/pom.xml | 4 +- .../tests/ADCMTAppTenantUserTestCase.java | 2 +- .../integration/tests/ADCMTAppTestCase.java | 2 +- .../agent/integration/tests/ADCTestCase.java | 2 +- .../integration/tests/AgentStartupTestCase.java | 32 +++++++-- .../tests/PythonAgentIntegrationTest.java | 15 +++++ .../extensions/py/startup-test-handler.py | 60 +++++++++++++++++ .../py/startup-test-handler.yapsy-plugin | 27 ++++++++ .../modules/distribution/src/assembly/bin.xml | 4 ++ .../application/ApplicationBurstingTest.java | 2 +- .../application/GroupStartupOrderTest.java | 2 +- .../PartitionOneAfterAnotherClusterTest.java | 2 +- .../PartitionRoundRobinClusterTest.java | 2 +- .../SampleApplicationStartupTestCase.java | 2 +- .../application/SingleClusterScalingTest.java | 2 +- 22 files changed, 228 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
