You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/16 15:34:43 UTC
[3/3] stratos git commit: Merge branch
'4.1.0-beta-deployment-policy-fix' of
https://git-wip-us.apache.org/repos/asf/stratos into
4.1.0-beta-deployment-policy-fix-local
Merge branch '4.1.0-beta-deployment-policy-fix' of https://git-wip-us.apache.org/repos/asf/stratos into 4.1.0-beta-deployment-policy-fix-local
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e3d49b27
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e3d49b27
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e3d49b27
Branch: refs/heads/4.1.0-beta-deployment-policy-fix
Commit: e3d49b27b5a8dc2ccc940672fb3c58ac31b40598
Parents: abfeb34 fa56c22
Author: R-Rajkumar <rr...@gmail.com>
Authored: Mon Feb 16 20:04:19 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Mon Feb 16 20:04:19 2015 +0530
----------------------------------------------------------------------
.../load/balancer/conf/LoadBalancerConfiguration.java | 14 ++++++++++++++
.../stratos/load/balancer/conf/util/Constants.java | 1 +
.../internal/LoadBalancerServiceComponent.java | 11 ++++++++---
.../balancer/test/LoadBalancerConfigurationTest.java | 2 ++
.../resources/sample/configuration/loadbalancer2.conf | 5 +++++
.../distribution/src/main/conf/loadbalancer.conf | 5 +++++
6 files changed, 35 insertions(+), 3 deletions(-)
----------------------------------------------------------------------