Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/83cbec46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/83cbec46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/83cbec46 Branch: refs/heads/master Commit: 83cbec4612b18611896c50ec963efdd08fc1ba6c Parents: 4fcdc4f 90a1af7 Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 6 10:22:01 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 6 10:22:01 2013 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.rest.endpoint/pom.xml | 6 +- .../bean/autoscaler/partition/Partition.java | 39 ++++ .../autoscaler/partition/PartitionGroup.java | 34 +++ .../policy/autoscale/AutoscalePolicy.java | 34 +++ .../policy/autoscale/LoadAverage.java | 36 +++ .../policy/autoscale/LoadThresholds.java | 32 +++ .../policy/autoscale/MemoryConsumption.java | 36 +++ .../policy/autoscale/RequestsInFlight.java | 36 +++ .../policy/deployment/DeploymentPolicy.java | 35 +++ .../bean/util/convert/PojoConverter.java | 25 ++ .../service/client/AutoscalerServiceClient.java | 111 +++++++++ .../rest/endpoint/services/ServiceUtils.java | 226 ++++++++++++++++++- .../rest/endpoint/services/StratosAdmin.java | 44 ++++ .../src/main/partitions/partitions.xml | 6 +- .../pom.xml | 1 + 15 files changed, 691 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
