Skip to content

Commit

Permalink
Merge pull request #101053 from robscott/automated-cherry-pick-of-#10…
Browse files Browse the repository at this point in the history
…0728-release-1.21

Automated cherry pick of #100728: Updating Topology Aware Hints to support "Auto" value for

Kubernetes-commit: 82c76d960142c52138d2836da14c964f592301b6
  • Loading branch information
k8s-publishing-bot committed May 18, 2021
1 parent 48ab514 commit e379db4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.16
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.6.1
k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6
k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37
)

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6 h1:rF9UWPFMeCzTx61QJd1PO4vZmpe8eNmJRuFGfZBG1r4=
k8s.io/apimachinery v0.0.0-20210329111815-e337f44144a6/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37 h1:TunYeninmgd1K1OI/QQUDmg0HMhq71kfraPk9EbGlRc=
k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
Expand Down

0 comments on commit e379db4

Please sign in to comment.