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 REST endpoints in migration docs (bp #8648) #8687

Merged
merged 2 commits into from
Feb 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 24, 2021

This is an automatic backport of pull request #8648 done by Mergify.

Cherry-pick of 897f20b has failed:

On branch mergify/bp/release/v0.41.x/pr-8648
Your branch is up to date with 'origin/release/v0.41.x'.

You are currently cherry-picking commit 897f20b1d.
  (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:   docs/migrations/rest.md

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* fix endpoints

* update docs

* fix routes

* update docs

Co-authored-by: Anil Kumar Kammari <[email protected]>
(cherry picked from commit 897f20b)

# Conflicts:
#	docs/migrations/rest.md
docs/migrations/rest.md Outdated Show resolved Hide resolved
docs/migrations/rest.md Outdated Show resolved Hide resolved
docs/migrations/rest.md Outdated Show resolved Hide resolved
@tac0turtle
Copy link
Member

@alessio please merge.

whats the reason to block merging stuff like this into releases. Do we really think this is a security concern?

@sahith-narahari sahith-narahari added the A:automerge Automatically merge PR once all prerequisites pass. label Feb 26, 2021
@alessio alessio merged commit ce82077 into release/v0.41.x Feb 26, 2021
@alessio alessio deleted the mergify/bp/release/v0.41.x/pr-8648 branch February 26, 2021 11:23
@alessio alessio added this to the v0.41.4 milestone Feb 26, 2021
@alessio
Copy link
Contributor

alessio commented Mar 2, 2021

@alessio please merge.

whats the reason to block merging stuff like this into releases. Do we really think this is a security concern?

?

@tac0turtle
Copy link
Member

Why do we have to block merges into the release branch. I guess this goes into a discussion of expanding the people who can merge things to more than just three, or we clone you.

@alessio
Copy link
Contributor

alessio commented Mar 2, 2021

Why do we have to block merges into the release branch. I guess this goes into a discussion of expanding the people who can merge things to more than just three, or we clone you.

I agree. I'll open a PR @marbar3778 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants