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

preflight: fix path for IBM GPG key (backport #210) #212

Merged
merged 1 commit into from
Feb 20, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 20, 2023

This is an automatic backport of pull request #210 done by Mergify.
Cherry-pick of 2d0718b has failed:

On branch mergify/bp/quincy/pr-210
Your branch is up to date with 'origin/quincy'.

You are currently cherry-picking commit 2d0718b.
  (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:   ceph_defaults/defaults/main.yml

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/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

@mergify mergify bot added the conflicts label Feb 20, 2023
Move to the top level directory, and copy the file naming convention
that Red Hat and EPEL use.

(cherry picked from commit 2d0718b)
@ktdreyer ktdreyer force-pushed the mergify/bp/quincy/pr-210 branch from ec6a2dc to 0f8686f Compare February 20, 2023 20:52
@andrewschoen andrewschoen merged commit d2b8498 into quincy Feb 20, 2023
@andrewschoen andrewschoen deleted the mergify/bp/quincy/pr-210 branch February 20, 2023 21:57
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.

2 participants