Skip to content

Merge upstream 2.3.0 to main#35

Draft
tvainika wants to merge 331 commits intomainfrom
merge-upstream-2.3.0-to-main
Draft

Merge upstream 2.3.0 to main#35
tvainika wants to merge 331 commits intomainfrom
merge-upstream-2.3.0-to-main

Conversation

@tvainika
Copy link
Member

@tvainika tvainika commented Feb 20, 2026

This skips or reverts most of our own local patches. Socks5 support
has landed upstream. Infinite loop related changes in aiven/main have
been fixed one way or another as per linking to submitted issues in
github. Only remaining changes are related to #32.

dpkp and others added 30 commits March 4, 2025 08:37
Co-authored-by: Matt Oberle <mattoberle@users.noreply.github.com>
…2521)

Co-authored-by: Emmanuel <manuco@users.noreply.github.com>
dpkp and others added 29 commits June 27, 2025 09:48
Co-authored-by: Alexandre Feblot <alexandre.feblot@forterro.com>
This skips or reverts most of our own local patches. Socks5 support
has landed upstream. Infinite loop related changes in aiven/main have
been fixed one way or another as per linking to submitted issues in
github. Only remaining changes are related to #32.
@tvainika
Copy link
Member Author

These are the commits from aiven/main that were not from upstream:

The commit 719cf45 has been merged upstream as dpkp#2670

The commit dfe42d0 is from #32 which has not been submitted to dpkp/kafka-python yet.

The commit 4a1b2f3 is a fixup to a927ff2 see below

The commit c662d94 fixes KeyError. Not sure if submitted upstream ever, but dpkp/pull/2504 seems to be the fix for similar situation.

The commit 1a6bf01 and commit 919f61d are a change and its revert, not needed anymore.

The commit 4ca2f45 submitted upstream as dpkp#2189 to fix dpkp/issues/2188. Upstream merged alternative solution in dpkp/pull/2504

The commit 6985761 and commit a927ff2 are submitted upstream as dpkp#2194 to fix a bug dpkp#2193. Upstream has merged dpkp#2648 as alternative solution to the issue.

The commit 6efff52 is SOCKS5 support originally submitted as dpkp#2169 which upstream merged with rebase in dpkp#2531.

The commit ce7d853 was submitted upstream as dpkp/pull/2091. Upstream has merged dpkp/pull/2480 with notes that "CPU usage during broker outages should be improved" with that PR.

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.