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/92ba82da Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/92ba82da Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/92ba82da Branch: refs/heads/master Commit: 92ba82da2e274f114e4c5cecf1178a3955ade9b4 Parents: 2170f30 58b6d99 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Dec 24 22:59:03 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Dec 24 22:59:03 2013 +0530 ---------------------------------------------------------------------- .../balancer/LoadBalancerTopologyReceiver.java | 52 ++++++++++----- .../rest-api-client/deploy-autoscale-policy.sh | 31 +++++++++ tools/rest-api-client/deploy-cartridge.sh | 31 +++++++++ .../rest-api-client/deploy-deployment-policy.sh | 31 +++++++++ .../deploy-load-balancer-cartridge.sh | 31 +++++++++ tools/rest-api-client/deploy-partition.sh | 31 +++++++++ tools/rest-api-client/subscribe.sh | 31 +++++++++ tools/templates/json/autoscale-policy.json | 28 ++++++++ tools/templates/json/cartridge.json | 49 ++++++++++++++ tools/templates/json/deployment-policy.json | 16 +++++ .../templates/json/load-balancer-cartridge.json | 67 ++++++++++++++++++++ tools/templates/json/partition.json | 14 ++++ tools/templates/json/subscribe.json | 12 ++++ 13 files changed, 408 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
