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/30279d35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/30279d35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/30279d35 Branch: refs/heads/master Commit: 30279d356e91c05d89a18ec246868fe1c664b596 Parents: 5c3712c 969ab39 Author: Manula Thantriwatte <[email protected]> Authored: Thu Mar 13 20:05:42 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Mar 13 20:05:42 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/manager/CartridgeSubscriptionManager.java | 2 +- tools/puppet3/modules/agent/templates/bin/stratos.sh.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
