You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@stratos.apache.org by dinithis <gi...@git.apache.org> on 2015/02/19 08:29:14 UTC
[GitHub] stratos pull request: Fixed CLI command for deactivate tenant
GitHub user dinithis opened a pull request:
https://github.com/apache/stratos/pull/235
Fixed CLI command for deactivate tenant
Fixed CLI command for deactivate tenant
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dinithis/stratos 4.1.0-beta-deployment-policy-fix
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/stratos/pull/235.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #235
----
commit 82dcd5279adc9229e9644f58d63c5729f3d77ec8
Author: Dinithi <di...@wso2.com>
Date: 2015-02-19T07:26:44Z
Fixed CLI command for deactivate tenant
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] stratos pull request: Fixed CLI command for deactivate tenant
Posted by imesh <gi...@git.apache.org>.
Github user imesh commented on the pull request:
https://github.com/apache/stratos/pull/235#issuecomment-75015706
Thanks for the fix @dinithis! I have now merged this to 4.1.0-beta-deployment-policy-fix branch.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] stratos pull request: Fixed CLI command for deactivate tenant
Posted by dinithis <gi...@git.apache.org>.
Github user dinithis closed the pull request at:
https://github.com/apache/stratos/pull/235
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] stratos pull request: Fixed CLI command for deactivate tenant
Posted by imesh <gi...@git.apache.org>.
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---