Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/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/7520d694 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7520d694 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7520d694 Branch: refs/heads/master Commit: 7520d6943198e287917b5a12aad75bd7de14c920 Parents: 99d5cdc 19ca4d7 Author: gayangunarathne <[email protected]> Authored: Wed Aug 26 15:54:41 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Wed Aug 26 15:54:41 2015 +0530 ---------------------------------------------------------------------- README.md | 2 +- .../applications/topic/ApplicationBuilder.java | 1 - .../services/impl/AutoscalerServiceImpl.java | 150 ++++++++++++------- .../org.apache.stratos.cartridge.agent/pom.xml | 2 - .../agent/test/JavaCartridgeAgentTest.java | 23 ++- .../test/resources/test-conf/test.properties | 20 +++ .../console/README.md | 10 +- .../modules/event/eventhandler.py | 2 +- .../rest/endpoint/api/StratosApiV41.java | 2 +- pom.xml | 3 + .../modules/distribution/pom.xml | 5 +- .../distribution/src/main/assembly/bin.xml | 1 - .../python-cartridge-agent/distribution/pom.xml | 3 +- .../distribution/src/main/assembly/bin.xml | 6 +- tools/config-scripts/ec2/config.sh | 5 - tools/config-scripts/gce/config.sh | 4 - tools/config-scripts/openstack/config.sh | 5 - tools/puppet3/modules/agent/files/README.txt | 2 +- tools/puppet3/modules/haproxy/files/README.txt | 2 +- tools/puppet3/modules/lb/files/README.txt | 2 +- .../modules/python_agent/files/README.txt | 2 +- tools/stratos-installer/README.md | 3 +- 22 files changed, 157 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
