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/febcde50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/febcde50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/febcde50 Branch: refs/heads/master Commit: febcde501688f242e23cdc39a02acedd8ce4bf0c Parents: f7b1092 a41ee2f Author: Udara Liyanage <[email protected]> Authored: Fri Dec 20 13:52:17 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Fri Dec 20 13:52:17 2013 -0500 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 10 ++++----- .../apache/stratos/cartridge/agent/Main.java | 3 +++ .../config/CartridgeAgentConfiguration.java | 4 ++-- .../config/configurator/JndiConfigurator.java | 18 ++++++++------- .../publisher/CartridgeAgentEventPublisher.java | 16 +++++++------- .../broker/heartbeat/TopicHealthChecker.java | 2 +- .../distribution/src/main/assembly/bin.xml | 1 - .../distribution/src/main/conf/jndi.properties | 23 -------------------- .../conf/templates/jndi.properties.template | 2 +- 9 files changed, 30 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
