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/35535a86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/35535a86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/35535a86 Branch: refs/heads/master Commit: 35535a867118ec16a11f7bd4303d200b6aa731bb Parents: f3ffe89 522db60 Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 10 09:43:37 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 10 09:43:37 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 63 ++++++-- .../autoscaler/partition/PartitionGroup.java | 2 +- .../policy/deployment/DeploymentPolicy.java | 4 + .../bean/util/converter/PojoConverter.java | 149 ++++++++++++++++++- .../rest/endpoint/services/ServiceUtils.java | 84 +++++++++-- .../rest/endpoint/services/StratosAdmin.java | 57 +++++-- .../pom.xml | 2 +- 7 files changed, 317 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/35535a86/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ----------------------------------------------------------------------
