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/01/28 15:16:32 UTC
[1/2] git commit: removing image-id from cloud-controller.xml
Updated Branches:
refs/heads/master c7f24b5bb -> 32796ae0e
removing image-id from cloud-controller.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/702508ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/702508ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/702508ce
Branch: refs/heads/master
Commit: 702508ce029e0f04427aca2a84e32040c407192f
Parents: 2ce0faf
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Jan 28 09:12:30 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Jan 28 09:12:30 2014 -0500
----------------------------------------------------------------------
.../src/main/resources/conf/cloud-controller.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/702508ce/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index 74789d1..1755f32 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -63,7 +63,6 @@
<property name="securityGroups" value="manager,cep,mb,default"/>
<property name="instanceType" value="m1.large"/>
<property name="keyPair" value="nirmal-key"/>
- <imageId>us-east-1/ami-52409a3b</imageId>
</iaasProvider-->
<iaasProvider type="openstack" name="openstack specific details">
<className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
@@ -75,7 +74,6 @@
<property name="jclouds.api-version" value="2.0/" />
<property name="X" value="x" />
<property name="Y" value="y" />
- <imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId>
</iaasProvider>
</iaasProviders>
</cloudController>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/32796ae0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/32796ae0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/32796ae0
Branch: refs/heads/master
Commit: 32796ae0e9afd292978afb1c5d0a80577f73903f
Parents: 702508c c7f24b5
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Jan 28 09:13:34 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Jan 28 09:13:34 2014 -0500
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 104 ++++++++--
.../stratos/cli/beans/AutoscalePolicy.java | 52 -----
.../org/apache/stratos/cli/beans/Cartridge.java | 201 -------------------
.../stratos/cli/beans/CartridgeInfoBean.java | 124 ------------
.../stratos/cli/beans/DeploymentPolicy.java | 31 ---
.../org/apache/stratos/cli/beans/Partition.java | 76 -------
.../apache/stratos/cli/beans/PropertyBean.java | 42 ----
.../beans/autoscaler/partition/Partition.java | 76 +++++++
.../autoscaler/partition/PropertyBean.java | 42 ++++
.../policy/autoscale/AutoscalePolicy.java | 63 ++++++
.../policy/autoscale/LoadAverage.java | 32 +++
.../policy/autoscale/LoadThresholds.java | 28 +++
.../policy/autoscale/MemoryConsumption.java | 33 +++
.../policy/autoscale/RequestsInFlight.java | 33 +++
.../policy/deployment/DeploymentPolicy.java | 31 +++
.../stratos/cli/beans/cartridge/Cartridge.java | 201 +++++++++++++++++++
.../cli/beans/cartridge/CartridgeInfoBean.java | 124 ++++++++++++
.../stratos/cli/beans/topology/Cluster.java | 170 ++++++++++++++++
.../stratos/cli/beans/topology/Member.java | 117 +++++++++++
.../cli/beans/topology/MemberStatus.java | 5 +
.../apache/stratos/cli/beans/topology/Port.java | 43 ++++
.../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 15 ++
22 files changed, 1104 insertions(+), 539 deletions(-)
----------------------------------------------------------------------