Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4a250721 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4a250721 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4a250721 Branch: refs/heads/stratos-4.1.x Commit: 4a250721b8a06e703e545a6322416c4eb53193fb Parents: f283096 1ed041d Author: Isuru Haththotuwa <[email protected]> Authored: Sat Nov 21 12:38:45 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Sat Nov 21 12:38:45 2015 +0530 ---------------------------------------------------------------------- .../modules/event/eventhandler.py | 18 +- .../cartridge.agent/publisher.py | 17 +- .../tests/ADCMTAppTenantUserTestCase.java | 4 +- .../integration/tests/ADCMTAppTestCase.java | 5 +- .../agent/integration/tests/ADCTestCase.java | 2 +- .../integration/tests/AgentStartupTestCase.java | 2 +- .../integration/tests/CEPHAModeTestCase.java | 2 +- .../tests/MessageBrokerHATestCase.java | 210 +++++++++---------- .../tests/PythonAgentIntegrationTest.java | 89 ++++---- .../MessageBrokerHATestCase/agent.conf | 10 +- .../MessageBrokerHATestCase/jndi.properties | 4 +- .../payload/launch-params | 2 +- .../src/test/resources/log4j.properties | 55 +++++ 13 files changed, 225 insertions(+), 195 deletions(-) ----------------------------------------------------------------------
