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(storage-network): annotated pod in creation loop (backport #2456) #2720

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 4, 2024

Which issue(s) this PR fixes:

Issue longhorn/longhorn#7640

What this PR does / why we need it:

longhorn/longhorn#7640 (comment)

Special notes for your reviewer:

None

Additional documentation or context

None


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

@mergify mergify bot requested a review from a team as a code owner April 4, 2024 20:44
@mergify mergify bot added the conflicts label Apr 4, 2024
Copy link
Author

mergify bot commented Apr 4, 2024

Cherry-pick of 6c305ae has failed:

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

You are currently cherry-picking commit 6c305ae3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/instance_manager_controller.go

no changes added to commit (use "git add" and/or "git commit -a")

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

@ejweber ejweber self-requested a review April 4, 2024 21:16
@ejweber ejweber marked this pull request as draft April 4, 2024 21:17
longhorn-7640

Co-authored-by: Chin-Ya Huang <chin-ya.huang@suse.com>
Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 43e997c)
@ejweber ejweber marked this pull request as ready for review April 4, 2024 21:23
Copy link
Contributor

@PhanLe1010 PhanLe1010 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@PhanLe1010 PhanLe1010 merged commit fb17970 into v1.5.x Apr 4, 2024
5 checks passed
@PhanLe1010 PhanLe1010 deleted the mergify/bp/v1.5.x/pr-2456 branch April 4, 2024 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants