Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/947b02ed Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/947b02ed Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/947b02ed Branch: refs/heads/master Commit: 947b02edc7f9ec842d3cf64aa780f9c112b6d0bf Parents: 83ae70f 0e2bbd6 Author: anuruddhal <[email protected]> Authored: Wed May 20 18:28:54 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Wed May 20 18:28:54 2015 +0530 ---------------------------------------------------------------------- .../applications/parser/ApplicationParser.java | 4 +- .../parser/DefaultApplicationParser.java | 38 +- .../CartridgeGroupNotFoundException.java | 17 +- .../exception/CartridgeNotFoundException.java | 37 ++ .../autoscaler/services/AutoscalerService.java | 8 +- .../services/impl/AutoscalerServiceImpl.java | 7 +- .../stratos/cli/RestCommandLineService.java | 24 +- .../common/client/AutoscalerServiceClient.java | 8 +- .../console/configure_form.jag | 34 +- .../configure/configure_requests.jag | 32 +- .../default/configure/application-policies.json | 17 + .../default/configure/applicationpolicies.json | 17 - .../default/configure/autoscaling-policies.json | 15 + .../default/configure/autoscalingpolicies.json | 15 - .../default/configure/cartridge-groups.json | 9 + .../default/configure/cartridgegroups.json | 9 - .../default/configure/deployment-policies.json | 15 + .../default/configure/deploymentpolicies.json | 15 - .../forms/default/configure/docker.json | 68 --- .../default/configure/kubernetes-clusters.json | 68 +++ .../default/configure/network-partitions.json | 17 + .../default/configure/networkpartitions.json | 17 - .../schema/configure/application-policies.json | 86 +++ .../schema/configure/applicationpolicies.json | 86 --- .../schema/configure/autoscaling-policies.json | 118 +++++ .../schema/configure/autoscalingpolicies.json | 118 ----- .../schema/configure/cartridge-groups.json | 46 ++ .../forms/schema/configure/cartridgegroups.json | 46 -- .../schema/configure/deployment-policies.json | 71 +++ .../schema/configure/deploymentpolicies.json | 71 --- .../forms/schema/configure/docker.json | 411 --------------- .../schema/configure/kubernetes-clusters.json | 411 +++++++++++++++ .../schema/configure/network-partitions.json | 94 ++++ .../schema/configure/networkpartitions.json | 94 ---- .../console/controllers/menu/menu.json | 14 +- .../controllers/wizard/wizard_requests.jag | 4 +- .../theme0/js/custom/applications-editor.js | 2 +- .../js/custom/applications_group_editor.js | 2 +- .../themes/theme0/partials/configure_form.hbs | 76 +-- .../console/themes/theme0/partials/wizard.hbs | 2 +- .../console/wizard.jag | 8 +- .../rest/endpoint/api/StratosApiV41.java | 39 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../artifacts/application.json | 2 +- .../kubernetes-cluster-2.json | 60 +++ .../kubernetes/network-partition-1.json | 2 +- .../src/main/resources/AutoscalerService.wsdl | 527 +++++++++++-------- 47 files changed, 1545 insertions(+), 1340 deletions(-) ----------------------------------------------------------------------
