You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@stratos.apache.org by anuruddhal <gi...@git.apache.org> on 2015/06/17 16:06:24 UTC
[GitHub] stratos pull request: Adding force undeployment button for UI
GitHub user anuruddhal opened a pull request:
https://github.com/apache/stratos/pull/370
Adding force undeployment button for UI
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/anuruddhal/stratos UI_Force_Undeploy
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/stratos/pull/370.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 #370
----
commit df66c0e288bfb66999fdf6b1fcbdd669e0462f51
Author: anuruddhal <an...@gmail.com>
Date: 2015-06-17T14:04:47Z
Adding force undeployment button for UI
----
---
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: Adding force undeployment button for UI
Posted by anuruddhal <gi...@git.apache.org>.
Github user anuruddhal commented on the pull request:
https://github.com/apache/stratos/pull/370#issuecomment-113416237
Hi Imesh,
I haven't done any changes in classes that have merge conflicts. And in the git hub it says "This pull request can be automatically merged by project collaborators."
Shall I resend the PR ?
---
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: Adding force undeployment button for UI
Posted by imesh <gi...@git.apache.org>.
Github user imesh commented on the pull request:
https://github.com/apache/stratos/pull/370#issuecomment-114015969
Thanks Anuruddha, that worked! I have now merged this pull request to master 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: Adding force undeployment button for UI
Posted by anuruddhal <gi...@git.apache.org>.
Github user anuruddhal commented on the pull request:
https://github.com/apache/stratos/pull/370#issuecomment-113911525
I have now updated branch with remote.
Can you please try again !
---
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: Adding force undeployment button for UI
Posted by imesh <gi...@git.apache.org>.
Github user imesh commented on the pull request:
https://github.com/apache/stratos/pull/370#issuecomment-113853646
Is your local branch up to date with the remote? May be that's the problem.
---
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: Adding force undeployment button for UI
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/stratos/pull/370
---
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: Adding force undeployment button for UI
Posted by imesh <gi...@git.apache.org>.
Github user imesh commented on the pull request:
https://github.com/apache/stratos/pull/370#issuecomment-113120658
Anuruddha: The merge process failed with the following:
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
Auto-merging components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
CONFLICT (content): Merge conflict in components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
Auto-merging components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
CONFLICT (content): Merge conflict in components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
Auto-merging components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
---
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.
---