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/c4d5b169 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c4d5b169 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c4d5b169 Branch: refs/heads/master Commit: c4d5b1695de229c61cab8c993bfc0210ab2ec693 Parents: 552613f 2651d6a Author: Udara Liyanage <[email protected]> Authored: Fri Mar 28 16:59:52 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Fri Mar 28 16:59:52 2014 -0400 ---------------------------------------------------------------------- .../behaviour/CartridgeMgtBehaviour.java | 21 +++++++--- .../client/CloudControllerServiceClient.java | 4 ++ .../category/DefaultLoadBalancerCategory.java | 43 +++++++++++++------- .../lb/category/LoadBalancerCategory.java | 17 +++----- 4 files changed, 52 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
