Updated Branches: refs/heads/master ad0d31f72 -> a2f1b5c35
take correct cartridge properties Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a2f1b5c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a2f1b5c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a2f1b5c3 Branch: refs/heads/master Commit: a2f1b5c35b1d0e9fc22f071f3cab5f039a4ee763 Parents: ad0d31f Author: Nirmal Fernando <[email protected]> Authored: Sat Dec 14 12:28:23 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sat Dec 14 12:28:23 2013 +0530 ---------------------------------------------------------------------- .../apache/stratos/cloud/controller/util/CloudControllerUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a2f1b5c3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index 121207a..12b34ed 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -139,7 +139,7 @@ public class CloudControllerUtil { } org.apache.stratos.cloud.controller.pojo.Properties props1 = - config.getProperties(); + iaasConfig.getProperties(); if (props1 != null) { for (Property prop : props1.getProperties()) { iaasProvider.addProperty(prop.getName(), prop.getValue());
