Skip to content

Upgrade eetcd to 0.3.5 (backport #4499) (backport #4500) #4501

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

Merged
merged 3 commits into from
Apr 10, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 10, 2022

This is an automatic backport of pull request #4500 done by Mergify.
Cherry-pick of 10b8b59 has failed:

On branch mergify/bp/v3.9.x/pr-4500
Your branch is up to date with 'origin/v3.9.x'.

You are currently cherry-picking commit 10b8b59f38.
  (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:   deps/rabbitmq_peer_discovery_etcd/Makefile
	modified:   release-notes/3.9.15.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   release-notes/3.10.0.md

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

(cherry picked from commit aa026a7)
(cherry picked from commit 10b8b59)

# Conflicts:
#	release-notes/3.10.0.md
(cherry picked from commit 536fd26)
(cherry picked from commit 2e893ca)
@michaelklishin
Copy link
Collaborator

@Mergifyio refresh

@mergify
Copy link
Author

mergify bot commented Apr 10, 2022

refresh

✅ Pull request refreshed

@michaelklishin michaelklishin merged commit 61432fc into v3.9.x Apr 10, 2022
@michaelklishin michaelklishin deleted the mergify/bp/v3.9.x/pr-4500 branch April 10, 2022 05:45
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.

1 participant