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

Adopt otp 26.2.5 (backport #11252) #11253

Merged
merged 2 commits into from
May 17, 2024
Merged

Adopt otp 26.2.5 (backport #11252) #11253

merged 2 commits into from
May 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 16, 2024

Automated changes created by https://github.com/rabbitmq/rabbitmq-server/actions/runs/9114822325 using the create-pull-request GitHub action in the Update OTP Patch Versions for Bazel Based Workflows workflow.


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

(cherry picked from commit 07cfb29)

# Conflicts:
#	MODULE.bazel
Copy link
Author

mergify bot commented May 16, 2024

Cherry-pick of 07cfb29 has failed:

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

You are currently cherry-picking commit 07cfb29e2b.
  (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:   WORKSPACE

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   MODULE.bazel

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 mergify bot assigned pjk25 May 16, 2024
@mergify mergify bot added the bazel label May 16, 2024
@pjk25 pjk25 merged commit c61383a into v3.13.x May 17, 2024
16 checks passed
@pjk25 pjk25 deleted the mergify/bp/v3.13.x/pr-11252 branch May 17, 2024 15:05
mergify bot added a commit that referenced this pull request May 17, 2024
* Adopt otp 26.2.5

(cherry picked from commit 07cfb29)

# Conflicts:
#	MODULE.bazel

* fixup backport

---------

Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Rin Kuryloski <rin.kuryloski@broadcom.com>
(cherry picked from commit c61383a)
michaelklishin added a commit that referenced this pull request May 17, 2024
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.

None yet

2 participants