Skip to content

Commit

Permalink
Merge pull request #109725 from soltysh/automated-cherry-pick-of-#109…
Browse files Browse the repository at this point in the history
…722-upstream-release-1.24

Automated cherry pick of #109722: Do not wrap lines if we can't read term size

Kubernetes-commit: ebe54dc2678ad3872afa0a7c5b4b02f14e426b71
  • Loading branch information
k8s-publishing-bot committed May 20, 2022
1 parent 457fddf commit 9a421f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ require (
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220420164651-0bf1867dde52
k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8
k8s.io/cli-runtime v0.0.0-20220420174606-6dc16e1f4834
k8s.io/client-go v0.0.0-20220420165542-686b396dc068
k8s.io/component-base v0.0.0-20220420170358-f73277b34692
k8s.io/component-helpers v0.0.0-20220420170647-cd27e63f85f2
Expand All @@ -50,7 +50,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220420164651-0bf1867dde52
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220420174606-6dc16e1f4834
k8s.io/client-go => k8s.io/client-go v0.0.0-20220420165542-686b396dc068
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220420163550-65c70a51ae8e
k8s.io/component-base => k8s.io/component-base v0.0.0-20220420170358-f73277b34692
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -882,8 +882,8 @@ k8s.io/api v0.0.0-20220420164651-0bf1867dde52 h1:HPNRLBMB+2PbcBn8pXc7Hyb4iN8P1Fw
k8s.io/api v0.0.0-20220420164651-0bf1867dde52/go.mod h1:qOGElvkvG4iusrwS28JSJgPofbMSCv5PWe0AD3boQGQ=
k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258 h1:9TgQL4ndOPmFSnQoTVN/ur/sU3RXMxaSmhMUBbflUTU=
k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8 h1:ZbBnGPg/KemzGqilVYDFeTKsFfWPiwmB+bG4JtFQi9Q=
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8/go.mod h1:7rS4pOeS253kcv+ZA4KJZmQV16OU/VC+Kr0xt/TRMbc=
k8s.io/cli-runtime v0.0.0-20220420174606-6dc16e1f4834 h1:V9Ql9GF0gBaJILV/apCLZGmx+gC/RVOxSjd0TtXquR4=
k8s.io/cli-runtime v0.0.0-20220420174606-6dc16e1f4834/go.mod h1:4NUCBS1vyud3amCQYcx6ilf21Wy6c8lSmNvqnKKXzXA=
k8s.io/client-go v0.0.0-20220420165542-686b396dc068 h1:jb0Jn+VtsEq7o2EkfcLh/KiW4276TO2Y5xgLo3riKvQ=
k8s.io/client-go v0.0.0-20220420165542-686b396dc068/go.mod h1:J+jC4WE19J7G2gTyKYvlGroIAdDgUb/Gsr3wyf2SOCQ=
k8s.io/code-generator v0.0.0-20220420163550-65c70a51ae8e/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
Expand Down

0 comments on commit 9a421f3

Please sign in to comment.