Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/63a676f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/63a676f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/63a676f1 Branch: refs/heads/master Commit: 63a676f15aed7551855dbd1e190c6c66253ebd5d Parents: f163f22 c30afba Author: Isuru <[email protected]> Authored: Sun Dec 8 13:05:26 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 8 13:05:26 2013 +0530 ---------------------------------------------------------------------- .../balancer/conf/LoadBalancerConfiguration.java | 19 ++++++++++++++++--- .../load/balancer/conf/util/Constants.java | 2 ++ .../test/LoadBalancerConfigurationTest.java | 5 ++++- .../sample/configuration/loadbalancer2.conf | 2 ++ .../distribution/src/main/conf/loadbalancer.conf | 2 ++ 5 files changed, 26 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
