You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/04/10 11:58:22 UTC
[1/3] stratos git commit: Adding Properties to the StubPartition
Repository: stratos
Updated Branches:
refs/heads/master fe52dfae0 -> ca9860bae
Adding Properties to the StubPartition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/476e77ad
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/476e77ad
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/476e77ad
Branch: refs/heads/master
Commit: 476e77ad72d7c0697f1d201547d7b8b9174014fa
Parents: 8815202
Author: anuruddhal <an...@gmail.com>
Authored: Wed Apr 8 16:48:54 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed Apr 8 16:48:54 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/util/converter/ObjectConverter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/476e77ad/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 4f1442a..4e6f1d7 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -346,7 +346,8 @@ public class ObjectConverter {
stubPartition.setId(partition.getId());
stubPartition.setPartitionMax(partition.getPartitionMax());
-
+ stubPartition.setProperties(convertPropertyBeansToCCStubProperties(partition.getProperty()));
+
return stubPartition;
}
[2/3] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by re...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1853acd6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1853acd6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1853acd6
Branch: refs/heads/master
Commit: 1853acd6d566b2055f2cdf774c685ba5498e996d
Parents: 476e77a 91227eb
Author: anuruddhal <an...@gmail.com>
Authored: Fri Apr 10 13:56:53 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Fri Apr 10 13:56:53 2015 +0530
----------------------------------------------------------------------
.../account/mgt/beans/AccountInfoBean.java | 16 +-
.../monitor/cluster/ClusterMonitor.java | 29 +-
.../stratos/autoscaler/TestRulesPackaged.java | 6 +
.../iaases/cloudstack/CloudStackIaas.java | 2 +-
.../controller/iaases/docker/DockerIaas.java | 6 +-
.../iaases/docker/DockerPartitionValidator.java | 54 +-
.../cloud/controller/iaases/ec2/EC2Iaas.java | 767 +++++++++----------
.../iaases/ec2/EC2PartitionValidator.java | 72 +-
.../cloud/controller/iaases/gce/GCEIaas.java | 756 +++++++++---------
.../iaases/gce/GCEPartitionValidator.java | 3 +-
.../iaases/kubernetes/KubernetesIaas.java | 35 +-
.../iaases/kubernetes/KubernetesIaasUtil.java | 10 +-
.../cloud/controller/iaases/mock/MockIaas.java | 8 +-
.../iaases/openstack/OpenstackIaas.java | 482 ++++++------
.../openstack/OpenstackPartitionValidator.java | 68 +-
.../networking/NeutronNetworkingApi.java | 356 ++++-----
.../openstack/networking/NovaNetworkingApi.java | 356 ++++-----
.../networking/OpenstackNetworkingApi.java | 6 +-
.../controller/iaases/vcloud/VCloudIaas.java | 400 +++++-----
.../iaases/vcloud/VCloudPartitionValidator.java | 9 +-
.../publisher/TopologyEventPublisher.java | 10 +-
.../publisher/TopologyEventSynchronizer.java | 10 +-
.../application/ApplicationEventReceiver.java | 36 +-
.../status/ClusterStatusTopicReceiver.java | 168 ++--
.../status/InstanceStatusTopicReceiver.java | 120 +--
.../messaging/topology/TopologyBuilder.java | 141 ++--
.../messaging/topology/TopologyManager.java | 9 +-
.../impl/CloudControllerServiceImpl.java | 449 ++++++-----
.../impl/CloudControllerServiceUtil.java | 5 +-
.../services/impl/InstanceCreator.java | 8 +-
.../services/impl/InstanceTerminator.java | 2 +-
.../publisher/BAMUsageDataPublisher.java | 40 +-
.../networking/NeutronNetworkingApiTest.java | 178 ++---
.../stratos/common/beans/TenantInfoBean.java | 21 +-
.../common/constants/StratosConstants.java | 1 +
.../rest/endpoint/api/StratosApiV41.java | 23 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 55 +-
.../extension/FaultHandlingWindowProcessor.java | 2 +-
.../modules/distribution/src/assembly/bin.xml | 8 +-
.../src/main/conf/drools/maxcheck.drl | 84 ++
.../artifacts/domain-mappings.json | 2 +-
.../scripts/common/update-deployment-policy.sh | 12 +
42 files changed, 2493 insertions(+), 2332 deletions(-)
----------------------------------------------------------------------
[3/3] stratos git commit: Merge branch 'master' of
https://github.com/anuruddhal/stratos
Posted by re...@apache.org.
Merge branch 'master' of https://github.com/anuruddhal/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ca9860ba
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ca9860ba
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ca9860ba
Branch: refs/heads/master
Commit: ca9860bae97c023166b2883289c6cccfa28b74b4
Parents: fe52dfa 1853acd
Author: reka <rt...@gmail.com>
Authored: Fri Apr 10 15:27:03 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Apr 10 15:27:03 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/util/converter/ObjectConverter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------