Skip to content

Commit 3208a1f

Browse files
committed
pr: rename collapse to merge
1 parent c390381 commit 3208a1f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

apis/v1beta1/gateway_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ type GatewaySpec struct {
130130
// matches. For example, `"foo.example.com"` takes precedence over
131131
// `"*.example.com"`, and `"*.example.com"` takes precedence over `""`.
132132
//
133-
// Implementations MAY collapse separate Gateways onto a single set of
134-
// Addresses if the Listeners across all Gateways are compatible.
133+
// Implementations MAY merge separate Gateways onto a single set of
134+
// Addresses if all Listeners across all Gateways are compatible.
135135
//
136136
// Support: Core
137137
//

config/crd/experimental/gateway.networking.k8s.io_gateways.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/standard/gateway.networking.k8s.io_gateways.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)