Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/70c20b3a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/70c20b3a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/70c20b3a Branch: refs/heads/master Commit: 70c20b3a04933c91ef3ba223ab401ec64f17771b Parents: 19f1f19 1330d86 Author: Dinithi <[email protected]> Authored: Fri Mar 6 15:28:59 2015 +0530 Committer: Dinithi <[email protected]> Committed: Fri Mar 6 15:28:59 2015 +0530 ---------------------------------------------------------------------- .../cartridge.agent/modules/artifactmgt/git/agentgithandler.py | 4 ++-- .../cartridge.agent/modules/subscriber/eventsubscriber.py | 2 +- tools/puppet3/modules/php/manifests/init.pp | 3 +-- tools/puppet3/modules/stratos_base/manifests/init.pp | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
