Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a6f4efe6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a6f4efe6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a6f4efe6 Branch: refs/heads/master Commit: a6f4efe6b3129d7f02f460f5e4a78cb8c66f35d9 Parents: 10bee14 882e92a Author: Imesh Gunaratne <[email protected]> Authored: Sun Oct 12 00:31:53 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Oct 12 00:31:53 2014 +0530 ---------------------------------------------------------------------- .../cartridge-agent/agent.conf | 2 + .../cartridge-agent/agent.py | 7 +- .../config/cartridgeagentconfiguration.py | 17 ++-- .../modules/datapublisher/logpublisher.py | 15 ++-- .../modules/event/topology/events.py | 25 +++--- .../extensions/abstractextensionhandler.py | 3 + .../extensions/defaultextensionhandler.py | 85 +++++++++++++------- .../modules/healthstatspublisher/healthstats.py | 12 +-- .../publisher/cartridgeagentpublisher.py | 2 +- .../modules/topology/topologycontext.py | 2 + .../modules/util/cartridgeagentutils.py | 4 +- .../modules/util/extensionutils.py | 2 +- 12 files changed, 111 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
