You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@stratos.apache.org by ud...@apache.org on 2014/09/16 06:28:48 UTC

[8/8] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/69ae3076
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/69ae3076
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/69ae3076

Branch: refs/heads/master
Commit: 69ae307699cca80f0fa84ee584ddfbdde1204e02
Parents: bc0f2f3 374e3fd
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 16 09:58:17 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 16 09:58:17 2014 +0530

----------------------------------------------------------------------
 .../apache/stratos/manager/dto/Cartridge.java   |   9 +
 .../org.apache.stratos.rest.endpoint/as.json    |  26 -
 .../bean/autoscaler/partition/Partition.java    |   2 +
 .../policy/autoscale/AutoscalePolicy.java       |  11 +
 .../policy/deployment/DeploymentPolicy.java     |   2 +
 .../definition/CartridgeDefinitionBean.java     |   4 +-
 .../definition/ServiceDefinitionBean.java       |   7 +
 .../endpoint/handlers/StratosMockHandler.java   | 146 ++++
 .../stratos/rest/endpoint/mock/MockContext.java | 714 +++++++++++++++----
 .../rest/endpoint/mock/StratosTestAdmin.java    |  28 +-
 .../webapp/stratos-test/WEB-INF/cxf-servlet.xml |   2 +
 .../stratos-test/WEB-INF/schemas/schema.xsd     |   5 +
 12 files changed, 796 insertions(+), 160 deletions(-)
----------------------------------------------------------------------