Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(provider): improve container removal logic (backport #134) #136

Open
wants to merge 1 commit into
base: release/v1.x.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 7, 2024


This is an automatic backport of pull request #134 done by [Mergify](https://mergify.com).

(cherry picked from commit a5fc9f5)

# Conflicts:
#	core/provider/digitalocean/task.go
@mergify mergify bot requested a review from Zygimantass as a code owner November 7, 2024 17:07
Copy link
Author

mergify bot commented Nov 7, 2024

Cherry-pick of a5fc9f5 has failed:

On branch mergify/bp/release/v1.x.x/pr-134
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit a5fc9f5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/provider/docker/volume.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/provider/digitalocean/task.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant