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/fda1f899 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fda1f899 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fda1f899 Branch: refs/heads/master Commit: fda1f899799e8f7f1c0fa89d49b86de1fd612769 Parents: 7d093fa b38d87c Author: Melan Nimesh <[email protected]> Authored: Wed Feb 5 08:34:00 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Wed Feb 5 08:34:00 2014 +0530 ---------------------------------------------------------------------- .../extension/api/LoadBalancerExtension.java | 28 +- .../conf/configurator/CEPConfigurator.java | 8 +- .../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 +- 16 files changed, 528 insertions(+), 224 deletions(-) ----------------------------------------------------------------------
