Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/deb831dd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/deb831dd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/deb831dd Branch: refs/heads/master Commit: deb831dd8f8a2e189fd59cf394553675960a8662 Parents: 349b273 7f1c44a Author: Udara Liyanage <[email protected]> Authored: Wed Aug 27 10:39:55 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Aug 27 10:39:55 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/manager/payload/BasicPayloadData.java | 2 ++ .../org/apache/stratos/manager/utils/CartridgeConstants.java | 1 + .../distribution/src/main/conf/cartridge-config.properties | 1 + tools/puppet3-agent/centos/init.sh | 6 +++++- tools/puppet3-agent/init.sh | 5 ++++- 5 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
