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
repl
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 ena
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 o
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 o
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 proje
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.c
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