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

[3.5] Backport: netutil: consistently format ipv6 addresses #15187

Merged

Conversation

Kidsan
Copy link
Contributor

@Kidsan Kidsan commented Jan 26, 2023

This is a backport of #15153

This formats ipv6 addresses to ensure they can be compared safely

Signed-off-by: kidsan 8798449+Kidsan@users.noreply.github.com

This formats ipv6 addresses to ensure they can be compared safely

Signed-off-by: kidsan <8798449+Kidsan@users.noreply.github.com>
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ahrtr
Copy link
Member

ahrtr commented Jan 26, 2023

Please add a changelog item in https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md

@Kidsan
Copy link
Contributor Author

Kidsan commented Jan 26, 2023

@ahrtr I hope I did that right: #15190

@ahrtr
Copy link
Member

ahrtr commented Feb 2, 2023

Leave it to @serathius to merge this PR since he has some comment in #15153 (comment).

Per my comment #15153 (comment), I think it's OK to merge this PR for now and add whatever additional IPv6 related test case in separate PRs.

@serathius
Copy link
Member

Just a note, we shouldn't do out of order backports. This fix is already in v3.4, forcing me to merge it as it would break clear git history. Backports for v3.4 should only take from PRs already backported to v3.5 and v3.5 should only take from fixes on main branch (assuming that issue is present on all releases).

Next time let's agree on backport plan before we start merging.

@serathius serathius merged commit 1664b4f into etcd-io:release-3.5 Feb 3, 2023
@ahrtr
Copy link
Member

ahrtr commented Feb 3, 2023

Backports for v3.4 should only take from PRs already backported to v3.5

I am afraid I can't agree this. 3.4 and 3.5 have huge differences, not every bug fix applies both branches. Backporting 3.4 should be independent with 3.5. The only agreement should be that both 3.4 and 3.5 should be backporting from main.

tjungblu pushed a commit to tjungblu/etcd that referenced this pull request Jul 26, 2023
…ease-3.5

[3.5] Backport: netutil: consistently format ipv6 addresses
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants