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

test: find backup should also wait until backup volume is synced (backport #1729) #1778

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 27, 2024

This is an automatic backport of pull request #1729 done by Mergify.
Cherry-pick of 66540f6 has failed:

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

You are currently cherry-picking commit 66540f62.
  (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:   manager/integration/tests/common.py

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@yangchiu yangchiu force-pushed the mergify/bp/v1.4.x/pr-1729 branch from 7284521 to 89f4c4e Compare February 27, 2024 02:43
Copy link
Member

@yangchiu yangchiu left a comment

Choose a reason for hiding this comment

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

LGTM

@yangchiu yangchiu merged commit 29ed1a2 into v1.4.x Feb 27, 2024
3 checks passed
@yangchiu yangchiu deleted the mergify/bp/v1.4.x/pr-1729 branch February 27, 2024 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant