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/df99e096 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/df99e096 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/df99e096 Branch: refs/heads/master Commit: df99e096883d25023f9b80fee274d504f21b2e64 Parents: 19b955f 94a940d Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 18 20:41:58 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 18 20:41:58 2013 +0530 ---------------------------------------------------------------------- .../stratos/adc/mgt/deploy/service/Service.java | 5 +- .../service/ServiceDeploymentManager.java | 15 +++- .../service/multitenant/MultiTenantService.java | 5 +- .../manager/CartridgeSubscriptionManager.java | 12 +++ .../adc/mgt/utils/PersistenceManager.java | 37 ++++++++ .../rest/endpoint/services/ServiceUtils.java | 17 +--- .../event/subscriber/ArtifactListener.java | 6 +- .../cartridge/agent/event/subscriber/Main.java | 22 +++++ tools/puppet/agent/etc/rc.local | 26 ++++++ tools/puppet/agent/root/bin/ec2_init.sh | 95 ++++++++++++++++++++ tools/puppet/agent/ruby/stratos_sendinfo.rb | 30 +++++++ 11 files changed, 247 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
