Merge branch 'master' of https://github.com/chamilad/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/61dc10a0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/61dc10a0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/61dc10a0 Branch: refs/heads/master Commit: 61dc10a0d0771e23e9dc71c99f902a550d78817b Parents: 340f848 fe7fe4e Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Nov 11 17:31:11 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Nov 11 17:31:11 2014 +0530 ---------------------------------------------------------------------- .../cartridgeagent/modules/event/topology/events.py | 7 ++++--- tools/puppet3/modules/python_agent/manifests/init.pp | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
