Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/eed199ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/eed199ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/eed199ba Branch: refs/heads/master Commit: eed199ba1917c9cd92c1ff55f10afb275b03fb14 Parents: 326c354 8b6ce5c Author: rekathiru <[email protected]> Authored: Fri Feb 21 18:53:51 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 21 18:53:51 2014 +0530 ---------------------------------------------------------------------- .../manager/client/AutoscalerServiceClient.java | 8 +++++++ .../manager/payload/BasicPayloadData.java | 23 ++++++++++++++++++++ .../manager/utils/CartridgeConstants.java | 2 ++ .../rest/endpoint/services/ServiceUtils.java | 6 ++--- .../src/main/conf/cartridge-config.properties | 3 +++ tools/stratos-installer/conf/setup.conf | 4 ++++ .../repository/conf/cartridge-config.properties | 2 ++ tools/stratos-installer/setup.sh | 14 ++++++++++++ 8 files changed, 59 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
