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 2014/03/05 04:56:42 UTC
[1/2] git commit: Added load.balancer=true property to sample lb
cartridge configuration
Repository: incubator-stratos
Updated Branches:
refs/heads/master 4854c66d1 -> 93ea71a6c
Added load.balancer=true property to sample lb cartridge configuration
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c4966c34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c4966c34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c4966c34
Branch: refs/heads/master
Commit: c4966c34c157a44d8416dccfc9910e308566a4bd
Parents: 102c997
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Mar 4 22:56:22 2014 -0500
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Mar 4 22:56:22 2014 -0500
----------------------------------------------------------------------
.../themes/theme1/partials/configure_stratos_wizard.hbs | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c4966c34/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
index b4d2dc5..9973f9d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
@@ -372,12 +372,18 @@
"imageId": "RegionOne/9865ed3f-724b-44e1-874f-f759aeceb9ef",
"property": [
{
- "name": "instanceType",
- "value": "RegionOne/2"
+ "name": "instanceType",
+ "value": "RegionOne/2"
}
]
}
- ]
+ ],
+ "property": [
+ {
+ "name": "load.balancer",
+ "value": "true"
+ }
+ ]
}
}
</pre>
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/93ea71a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/93ea71a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/93ea71a6
Branch: refs/heads/master
Commit: 93ea71a6c9516b5b4bb1641826a6ba3b52a23197
Parents: c4966c3 4854c66
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Mar 4 22:56:36 2014 -0500
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Mar 4 22:56:36 2014 -0500
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------