Add merge documentation#4
Merged
Merged
Conversation
Add missing merge documentation.
harshavardhana
approved these changes
Nov 29, 2019
jasoncwik
pushed a commit
to jasoncwik/warp
that referenced
this pull request
Oct 29, 2024
Merge changes from minio
harshavardhana
pushed a commit
that referenced
this pull request
May 30, 2026
Fixes Go problems and: ``` Vulnerability #1: GO-2026-4918 Infinite loop in HTTP/2 transport when given bad SETTINGS_MAX_FRAME_SIZE in net/http/internal/http2 in golang.org/x/net More info: https://pkg.go.dev/vuln/GO-2026-4918 Module: golang.org/x/net Found in: golang.org/x/net@v0.52.0 Fixed in: golang.org/x/net@v0.53.0 Example traces found: #1: pkg/iceberg/catalog.go:365:24: iceberg.DeleteWarehouse calls http.Client.Do, which eventually calls http2.Transport.NewClientConn #2: pkg/iceberg/catalog.go:365:24: iceberg.DeleteWarehouse calls http.Client.Do, which eventually calls http2.Transport.RoundTrip #3: pkg/iceberg/catalog.go:365:24: iceberg.DeleteWarehouse calls http.Client.Do, which eventually calls http2.noDialH2RoundTripper.NewClientConn #4: pkg/iceberg/catalog.go:365:24: iceberg.DeleteWarehouse calls http.Client.Do, which eventually calls http2.noDialH2RoundTripper.RoundTrip #5: pkg/iceberg/catalog.go:365:24: iceberg.DeleteWarehouse calls http.Client.Do, which eventually calls http2.unencryptedTransport.RoundTrip ``` * Bump CIlint and x/net * lint
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add missing merge documentation.