Skip to content

Add merge documentation#4

Merged
harshavardhana merged 1 commit into
minio:masterfrom
klauspost:add-merge-doc
Nov 29, 2019
Merged

Add merge documentation#4
harshavardhana merged 1 commit into
minio:masterfrom
klauspost:add-merge-doc

Conversation

@klauspost

Copy link
Copy Markdown
Collaborator

Add missing merge documentation.

Add missing merge documentation.
@harshavardhana harshavardhana merged commit 5ef93ec into minio:master Nov 29, 2019
@klauspost klauspost deleted the add-merge-doc branch December 6, 2019 12:44
jasoncwik pushed a commit to jasoncwik/warp that referenced this pull request Oct 29, 2024
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
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.

2 participants