You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/19 08:02:30 UTC

[2/3] stratos git commit: cleanup cartridge schema

cleanup cartridge schema


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

Branch: refs/heads/master
Commit: ba9b2d6e741020309cde3e79a67ba58fcc5f11ec
Parents: 3a54943
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Jan 19 11:35:33 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 12:29:02 2015 +0530

----------------------------------------------------------------------
 .../controllers/forms/default/configure/cartridges.json   |  1 -
 .../controllers/forms/schema/configure/cartridges.json    | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/ba9b2d6e/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
index 82c9d35..22f2148 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
@@ -25,7 +25,6 @@
         {
             "type":"ec2",
             "imageId":"ap-southeast-1/ami-2e0d5a7c",
-            "maxInstanceLimit":"4",
             "property":[
                 {
                     "name":"instanceType",

http://git-wip-us.apache.org/repos/asf/stratos/blob/ba9b2d6e/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
index a3076e1..f078093 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
@@ -185,7 +185,7 @@
                 "type": "object",
                 "id": "root/iaasProvider/0",
                 "format": "grid",
-                "required": ["type", "imageId", "maxInstanceLimit"],
+                "required": ["type", "imageId"],
                 "properties": {
                     "type": {
                         "type": "string",
@@ -201,14 +201,6 @@
                         "name": "Image ID",
                         "default": "ap-southeast-1/amiĀ­-70326522"
                     },
-                    "maxInstanceLimit": {
-                        "type": "number",
-                        "id": "root/iaasProvider/0/maxInstanceLimit",
-                        "title": "Max Instance Limit",
-                        "name": "Max Instance Limit",
-                        "default": "5",
-                        "format": "number"
-                    },
                     "property": {
                         "type": "array",
                         "id": "root/iaasProvider/0/property",