Skip to content

Commit 6b627a2

Browse files
author
shiftstack-merge-bot
committed
Updating and vendoring go modules after an upstream merge
1 parent b150bdc commit 6b627a2

File tree

9 files changed

+191
-19
lines changed

9 files changed

+191
-19
lines changed

‎vendor/github.com/spf13/pflag/.editorconfig

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

‎vendor/github.com/spf13/pflag/.golangci.yaml

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

‎vendor/github.com/spf13/pflag/flag.go

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

‎vendor/github.com/spf13/pflag/ip.go

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

‎vendor/github.com/spf13/pflag/ipnet_slice.go

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

‎vendor/github.com/spf13/pflag/string_array.go

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

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ github.com/spf13/cast
494494
# github.com/spf13/cobra v1.8.1
495495
## explicit; go 1.15
496496
github.com/spf13/cobra
497-
# github.com/spf13/pflag v1.0.5
497+
# github.com/spf13/pflag v1.0.6
498498
## explicit; go 1.12
499499
github.com/spf13/pflag
500500
# github.com/spf13/viper v1.19.0
@@ -1542,7 +1542,7 @@ sigs.k8s.io/cluster-api/test/infrastructure/container
15421542
sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1
15431543
sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1
15441544
sigs.k8s.io/cluster-api/test/infrastructure/kind
1545-
# sigs.k8s.io/controller-runtime v0.19.4
1545+
# sigs.k8s.io/controller-runtime v0.19.5
15461546
## explicit; go 1.22.0
15471547
sigs.k8s.io/controller-runtime
15481548
sigs.k8s.io/controller-runtime/pkg/builder

‎vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go

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

‎vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)