Skip to content

[2.0.x] Async Http Client 2.15.0 + netty-reactive-streams upgrade (backport #1299) by @mkurz#1301

Closed
mergify[bot] wants to merge 1 commit into
2.0.xfrom
mergify/bp/2.0.x/pr-1299
Closed

[2.0.x] Async Http Client 2.15.0 + netty-reactive-streams upgrade (backport #1299) by @mkurz#1301
mergify[bot] wants to merge 1 commit into
2.0.xfrom
mergify/bp/2.0.x/pr-1299

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 13, 2026

(cherry picked from commit 794de39)

# Conflicts:
#	project/Dependencies.scala
@mergify mergify Bot added the conflicts label May 13, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 13, 2026

Cherry-pick of 794de39 has failed:

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

You are currently cherry-picking commit 794de39.
  (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

@mkurz mkurz closed this May 13, 2026
@mkurz mkurz deleted the mergify/bp/2.0.x/pr-1299 branch May 13, 2026 13:39
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