You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/11/01 11:24:25 UTC

[2/2] 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/8f55499a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8f55499a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8f55499a

Branch: refs/heads/master
Commit: 8f55499a3e859d8d2508db5e230f7e28b37a526a
Parents: 544505b 8dd6145
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Nov 1 15:58:27 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Nov 1 15:58:27 2013 +0530

----------------------------------------------------------------------
 .../stratos/lb/endpoint/RequestDelegator.java   |   4 +
 .../TenantAwareLoadBalanceEndpoint.java         |  19 +-
 .../openstack/php/cartridge-agent.sh            | 261 +++++++++++++++++++
 .../cartridge-agent/openstack/php/clean.sh      |  39 +++
 .../openstack/php/get-launch-params.rb          |  54 ++++
 .../openstack/php/healthcheck.sh                |  33 +++
 .../distribution/src/main/bin/stratos.bat       |   2 +-
 .../distribution/src/main/bin/stratos.sh        |   2 +
 .../distribution/src/main/conf/log4j.properties |   3 +-
 .../synapse-configs/default/sequences/fault.xml |  32 +--
 10 files changed, 423 insertions(+), 26 deletions(-)
----------------------------------------------------------------------