You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/10 11:13:46 UTC
[1/2] stratos git commit: fix jira [STRATOS-1240] Error while adding
a network partition
Repository: stratos
Updated Branches:
refs/heads/master 1e79490e4 -> 92ccefca7
fix jira [STRATOS-1240] Error while adding a network partition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/72241c01
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/72241c01
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/72241c01
Branch: refs/heads/master
Commit: 72241c0117601f0a9229c5f45c2ecf75873d075f
Parents: 38e4d03
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Tue Mar 10 06:56:38 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Tue Mar 10 06:56:38 2015 +0530
----------------------------------------------------------------------
.../controllers/forms/default/configure/partitions.json | 2 +-
.../controllers/forms/schema/configure/partitions.json | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/72241c01/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
index f461c68..c8ce3bf 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
@@ -1,10 +1,10 @@
{
"id": "network-p1",
"activeByDefault": "true",
+ "provider": "mock",
"partitions": [
{
"id": "p1",
- "provider": "mock",
"property": [
{
"name": "region",
http://git-wip-us.apache.org/repos/asf/stratos/blob/72241c01/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
index 88f11a0..87d021a 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
@@ -14,6 +14,12 @@
"type": "string",
"title":"Network Partition Id"
},
+ "provider": {
+ "id": "root/provider",
+ "type": "string",
+ "title":"Network Partition provider",
+ "enum": ["mock", "ec2", "openstack", "kubernetes"]
+ },
"activeByDefault": {
"id": "root/activeByDefault",
"type": "boolean",
@@ -32,10 +38,6 @@
"id": "root/partitions/0/id",
"type": "string"
},
- "provider": {
- "id": "root/partitions/0/provider",
- "type": "string"
- },
"property": {
"id": "root/partitions/0/property",
"type": "array",
[2/2] stratos git commit: This closes #269
Posted by ra...@apache.org.
This closes #269
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/92ccefca
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/92ccefca
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/92ccefca
Branch: refs/heads/master
Commit: 92ccefca7b38d2269b698c431ff3242fd460e07e
Parents: 1e79490 72241c0
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Mar 10 15:43:23 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Mar 10 15:43:23 2015 +0530
----------------------------------------------------------------------
.../controllers/forms/default/configure/partitions.json | 2 +-
.../controllers/forms/schema/configure/partitions.json | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------