You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/02/05 06:55:02 UTC
[4/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/e103ab6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e103ab6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e103ab6d
Branch: refs/heads/master
Commit: e103ab6d083a108fe80f33d98c093b3d9a25ec47
Parents: e1c44b6 b38d87c
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Wed Feb 5 11:20:54 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Wed Feb 5 11:20:54 2014 +0530
----------------------------------------------------------------------
.../extension/api/LoadBalancerExtension.java | 28 +-
.../conf/configurator/CEPConfigurator.java | 8 +-
.../balancer/mediators/ResponseInterceptor.java | 10 +-
.../console/controllers/loginSubmit.jag | 24 +-
.../console/controllers/logout.jag | 14 +-
.../console/controllers/router.jag | 16 +-
.../console/themes/theme1/partials/header.hbs | 302 +++++++++----------
.../service/ServiceDeploymentManager.java | 37 ++-
.../rest/endpoint/services/ServiceUtils.java | 42 ++-
.../src/main/bin/haproxy-extension.sh | 4 +-
.../src/main/conf/log4j.properties | 1 +
.../stratos/haproxy/extension/Constants.java | 36 +++
.../haproxy/extension/HAProxyConfigWriter.java | 6 +-
.../haproxy/extension/HAProxyContext.java | 62 +++-
.../apache/stratos/haproxy/extension/Main.java | 2 +-
products/stratos-manager/conf/log4j.properties | 168 +++++++++++
.../modules/distribution/src/assembly/bin.xml | 2 +-
17 files changed, 535 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e103ab6d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------