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/ea65ed7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ea65ed7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ea65ed7f Branch: refs/heads/master Commit: ea65ed7fbd2be99a33f671d54e0586710481d723 Parents: a95feee c2aeea2 Author: Manula Thantriwatte <[email protected]> Authored: Wed Feb 12 16:30:38 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Feb 12 16:30:38 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 24 +++++++++++++++++++- .../agent/util/CartridgeAgentConstants.java | 2 ++ .../rest/endpoint/services/ServiceUtils.java | 5 ++-- .../distribution/src/main/bin/stratos.sh | 2 ++ 4 files changed, 30 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
