Github user imesh commented on the pull request: https://github.com/apache/stratos/pull/235#issuecomment-75015403 @dinithis Thanks for the fix! It seems like the merge process fails with the below error: Falling back to patching base and 3-way merge... Auto-merging service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl CONFLICT (content): Merge conflict in service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl Auto-merging components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java Auto-merging components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java Auto-merging components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java Failed to merge in the changes. Patch failed at 0009 Updating kubernetes host definition and adding private and public ip addresses
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---