You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/16 15:41:33 UTC
[1/2] git commit: fixing cartridge properties overwriting issue -
this is a temp fix, need to fix properly
Updated Branches:
refs/heads/master fbf69efb7 -> 61caa7619
fixing cartridge properties overwriting issue - this is a temp fix, need to fix properly
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f8364b6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f8364b6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f8364b6d
Branch: refs/heads/master
Commit: f8364b6d4596976e6d72d01f2f7f8380cb2ca897
Parents: cd028a1
Author: Isuru <is...@wso2.com>
Authored: Thu Jan 16 20:10:41 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Jan 16 20:10:41 2014 +0530
----------------------------------------------------------------------
.../stratos/manager/manager/CartridgeSubscriptionManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8364b6d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index 65f91da..7e00740 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -120,7 +120,9 @@ public class CartridgeSubscriptionManager {
cartridgeInfo =
CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
if (props != null) {
- cartridgeInfo.setProperties(props);
+ // TODO: temp fix, need to do a proper fix
+ for (Property property : props)
+ cartridgeInfo.addProperties(property);
}
} catch (UnregisteredCartridgeException e) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@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/61caa761
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/61caa761
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/61caa761
Branch: refs/heads/master
Commit: 61caa7619c5d54499ce04d9f60df89a3b8d0caa1
Parents: f8364b6 fbf69ef
Author: Isuru <is...@wso2.com>
Authored: Thu Jan 16 20:10:56 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Jan 16 20:10:56 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------