Fixed conflits in merging docker integration branch to master
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5e2eed67 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5e2eed67 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5e2eed67 Branch: refs/heads/master Commit: 5e2eed67459ec78e56aef2005c117d329cf19c59 Parents: 1d91cf6 Author: Manula Thantriwatte <[email protected]> Authored: Fri Sep 26 07:55:33 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Sep 26 07:55:33 2014 +0000 ---------------------------------------------------------------------- .../bean/util/converter/PojoConverter.java | 2 - .../src/main/resources/AutoScalerService.wsdl | 919 ++++++++++++++++--- .../main/resources/CloudControllerService.wsdl | 472 +++++----- 3 files changed, 1028 insertions(+), 365 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5e2eed67/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 724e554..5477fff 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -455,8 +455,6 @@ public class PojoConverter { return partitionBeans; } - public static List<SubscriptionDomainBean> populateSubscriptionDomainPojos(List<SubscriptionDomain> subscriptionDomains) { - public static List<SubscriptionDomainBean> populateSubscriptionDomainPojos(List<SubscriptionDomain> subscriptionDomains) { List<SubscriptionDomainBean> subscriptionDomainBeans = new ArrayList<SubscriptionDomainBean>();
