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/09 09:39:21 UTC
[1/3] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Repository: stratos
Updated Branches:
refs/heads/master 798977a4f -> d11ed6c6e
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/24d0e5ef
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/24d0e5ef
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/24d0e5ef
Branch: refs/heads/master
Commit: 24d0e5ef3a2917a481125b3c25015bb31568cf2c
Parents: 6f1cc64 f2f888b
Author: Dinithi <di...@wso2.com>
Authored: Mon Mar 9 12:13:22 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Mon Mar 9 12:13:22 2015 +0530
----------------------------------------------------------------------
.../OneAfterAnotherAlgorithm.java | 56 +++-
.../policy/deployment/ApplicationPolicy.java | 10 +
.../stratos/autoscaler/util/AutoscalerUtil.java | 38 +++
.../common/constants/StratosConstants.java | 3 +
.../application-policy-4.json | 20 ++
.../applications/app-bursting-pattern/README.md | 8 +
.../artifacts/application-signup.json | 18 ++
.../artifacts/application.json | 25 ++
.../artifacts/domain-mappings.json | 9 +
.../scripts/common/deploy.sh | 51 ++++
.../scripts/common/undeploy.sh | 33 +++
.../app-bursting-pattern/scripts/ec2/deploy.sh | 9 +
.../scripts/ec2/undeploy.sh | 7 +
.../scripts/kubernetes/deploy.sh | 16 ++
.../scripts/kubernetes/undeploy.sh | 13 +
.../app-bursting-pattern/scripts/mock/deploy.sh | 9 +
.../scripts/mock/undeploy.sh | 7 +
.../scripts/openstack/deploy.sh | 9 +
.../scripts/openstack/undeploy.sh | 7 +
.../deployment-policy-4.json | 20 ++
.../mock/network-partition-4.json | 15 +
.../src/main/resources/AutoscalerService.wsdl | 279 ++++++++++---------
22 files changed, 522 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
[3/3] stratos git commit: Fixed issued found in list-cartridge-groups
CLI command
Posted by ra...@apache.org.
Fixed issued found in list-cartridge-groups CLI command
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d11ed6c6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d11ed6c6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d11ed6c6
Branch: refs/heads/master
Commit: d11ed6c6e5f9e6959f9eb4dce73046a885019681
Parents: ada10e8
Author: Dinithi <di...@wso2.com>
Authored: Mon Mar 9 13:43:57 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Mon Mar 9 13:43:57 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/cli/RestCommandLineService.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d11ed6c6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 87b6b58..9a3f171 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -369,13 +369,12 @@ public class RestCommandLineService {
public String[] getData(GroupBean cartridgeGroup) {
String[] data = new String[4];
data[0] = cartridgeGroup.getName();
- data[1] = String.valueOf(cartridgeGroup.getCartridges().size());
- data[2] = String.valueOf(cartridgeGroup.getGroups().size());
+ data[1] = cartridgeGroup.getCartridges()==null ? "" :String.valueOf(cartridgeGroup.getCartridges().size());
+ data[2] = cartridgeGroup.getGroups() == null ? "0" : String.valueOf(cartridgeGroup.getGroups().size());
data[3] = String.valueOf(cartridgeGroup.isGroupScalingEnabled());
return data;
}
};
-
GroupBean[] cartridgeGroups = new GroupBean[cartridgeGroupList.size()];
cartridgeGroups = cartridgeGroupList.toArray(cartridgeGroups);
[2/3] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Posted by ra...@apache.org.
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ada10e84
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ada10e84
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ada10e84
Branch: refs/heads/master
Commit: ada10e84a8b600a3ac2c403f9610dbdb8c75391c
Parents: 24d0e5e 798977a
Author: Dinithi <di...@wso2.com>
Authored: Mon Mar 9 13:42:18 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Mon Mar 9 13:42:18 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/mock/iaas/services/impl/MockInstance.java | 4 ++--
samples/applications/app-bursting-pattern/README.md | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------