Skip to content

[2.9.x] Explicitly depend on netty-reactive-streams-http transitive dependencies (backport #12403) by @mkurz#12404

Merged
mergify[bot] merged 1 commit into
2.9.xfrom
mergify/bp/2.9.x/pr-12403
Feb 26, 2024
Merged

[2.9.x] Explicitly depend on netty-reactive-streams-http transitive dependencies (backport #12403) by @mkurz#12404
mergify[bot] merged 1 commit into
2.9.xfrom
mergify/bp/2.9.x/pr-12403

Conversation

@mergify

@mergify mergify Bot commented Feb 26, 2024

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #12403 done by Mergify.
Cherry-pick of 90e3c3d has failed:

On branch mergify/bp/2.9.x/pr-12403
Your branch is up to date with 'origin/2.9.x'.

You are currently cherry-picking commit 90e3c3d127.
  (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:   project/Dependencies.scala

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/pull-requests/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 90e3c3d)

# Conflicts:
#	project/Dependencies.scala
@mergify mergify Bot merged commit d3f5ddd into 2.9.x Feb 26, 2024
@mergify mergify Bot deleted the mergify/bp/2.9.x/pr-12403 branch February 26, 2024 14:45
@mkurz

mkurz commented Feb 26, 2024

Copy link
Copy Markdown
Member

@Mergifyio backport 2.8.x

@mergify

mergify Bot commented Feb 26, 2024

Copy link
Copy Markdown
Contributor Author

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.

1 participant