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

Update k8s.gcr.io to registry.k8s.io (backport #1256) #1274

Merged
merged 1 commit into from
Mar 1, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 1, 2023

This is an automatic backport of pull request #1256 done by Mergify.
Cherry-pick of b22ed68 has failed:

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

You are currently cherry-picking commit b22ed687.
  (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:   docs/content/manual/release-specific/v1.2.3/test-scalability-with-backing-image.md
	modified:   docs/content/manual/release-specific/v1.3.0/test-longhorn-manager-starting-scalability.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mirror_csi_images/scripts/publish.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

Signed-off-by: Rayan Das <rayandas91@gmail.com>
(cherry picked from commit b22ed68)
@yangchiu yangchiu force-pushed the mergify/bp/v1.3.x/pr-1256 branch from d56552a to 5a11761 Compare March 1, 2023 02:42
@yangchiu yangchiu requested review from innobead and a team March 1, 2023 05:36
@yangchiu yangchiu self-assigned this Mar 1, 2023
@innobead innobead merged commit 16eebe0 into v1.3.x Mar 1, 2023
@innobead innobead deleted the mergify/bp/v1.3.x/pr-1256 branch March 1, 2023 07:05
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.

3 participants