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/3eedcf74 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3eedcf74 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3eedcf74 Branch: refs/heads/master Commit: 3eedcf743f988044ca3b19c7e4ccabc7cbb7590e Parents: 2690d14 7f1c44a Author: Chris Snow <[email protected]> Authored: Fri Aug 29 16:54:14 2014 +0000 Committer: Chris Snow <[email protected]> Committed: Fri Aug 29 16:54:14 2014 +0000 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
