Skip to content

Commit

Permalink
Merge pull request #94945 from ialidzhikov/automated-cherry-pick-of-#…
Browse files Browse the repository at this point in the history 
…94666-upstream-release-1.18

Automated cherry pick of #94666: Handle nil elements when sorting, instead of panicking

Kubernetes-commit: 7fc4cb91ac0d8d7082998e53197de11514d696e0
  • Loading branch information
@k8s-publishing-bot
k8s-publishing-bot committed Sep 29, 2020
1 parent 508c8c8 commit 647cae4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Godeps/Godeps.json
View file

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ require (
k8s.io/api v0.0.0-20200903132205-4352ece35dc9
k8s.io/apimachinery v0.0.0-20200903131814-1a4218b8b919
k8s.io/cli-runtime v0.0.0-20200903140634-426396820054
k8s.io/client-go v0.0.0-20200904053044-f3104ae88ed4
k8s.io/client-go v0.0.0-20200904053045-4c2c810a97d3
k8s.io/component-base v0.0.0-20200903133847-65f5cb33b5af
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 // release-1.18
Expand All @@ -57,7 +57,7 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20200903132205-4352ece35dc9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200903131814-1a4218b8b919
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200903140634-426396820054
k8s.io/client-go => k8s.io/client-go v0.0.0-20200904053044-f3104ae88ed4
k8s.io/client-go => k8s.io/client-go v0.0.0-20200904053045-4c2c810a97d3
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c
k8s.io/component-base => k8s.io/component-base v0.0.0-20200903133847-65f5cb33b5af
k8s.io/metrics => k8s.io/metrics v0.0.0-20200903140419-7e794871ebd7
Expand Down
2 changes: 1 addition & 1 deletion go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
k8s.io/api v0.0.0-20200903132205-4352ece35dc9/go.mod h1:pfD5vQS9vnO4IDjaPeU+KovTfbFrRz2VKg7/PvdLUS0=
k8s.io/apimachinery v0.0.0-20200903131814-1a4218b8b919/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk=
k8s.io/cli-runtime v0.0.0-20200903140634-426396820054/go.mod h1:nAeQSqfmRZKjJAqHcVK3xYmWsdNZ/sZUR+tws7Hv5zU=
k8s.io/client-go v0.0.0-20200904053044-f3104ae88ed4/go.mod h1:D3dxumZbrEHqZzOrC9BzR5xjcr8CT90zel1uVLVs528=
k8s.io/client-go v0.0.0-20200904053045-4c2c810a97d3/go.mod h1:D3dxumZbrEHqZzOrC9BzR5xjcr8CT90zel1uVLVs528=
k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
k8s.io/component-base v0.0.0-20200903133847-65f5cb33b5af/go.mod h1:Q0E5zjMNJqTL1VxMFWPl/TGLObqo57HYOKNPLOpV1R4=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
Expand Down

0 comments on commit 647cae4

Please sign in to comment.