You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2013/10/25 17:09:07 UTC
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/cb819ed1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cb819ed1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cb819ed1
Branch: refs/heads/master
Commit: cb819ed1ada31aba6c8526b09f0423513b6a413e
Parents: 3db7ccc d50cf4f
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 19:22:23 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 19:22:23 2013 +0530
----------------------------------------------------------------------
products/cartridge-agent/pom.xml | 5 ++
.../src/main/assembly/assembly.xml | 2 +
.../src/main/bin/cartridge-agent.sh | 50 +++++++++++++++++-
.../stratos/cartridge/agent/CartridgeAgent.java | 53 ++++++++++++++++----
.../stratos/cartridge/agent/EventPublisher.java | 21 ++++++--
.../apache/stratos/cartridge/agent/Main.java | 20 ++++----
.../stratos/cartridge/agent/UserData.java | 30 +++++++++--
.../src/main/resources/jndi.properties | 2 +-
.../src/main/resources/log4j.properties | 2 +-
9 files changed, 152 insertions(+), 33 deletions(-)
----------------------------------------------------------------------