Skip to content

Commit

Permalink
Merge pull request kubernetes-csi#74 from xing-yang/update_version
Browse files Browse the repository at this point in the history
Update vendor files to point to release 1.12.0
  • Loading branch information
k8s-ci-robot authored Oct 1, 2018
2 parents bce2b33 + 67452f1 commit a3aec02
Show file tree
Hide file tree
Showing 24 changed files with 1,542 additions and 1,125 deletions.
164 changes: 141 additions & 23 deletions Gopkg.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.12.0-beta.1"
branch = "release-1.12"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.12.0-beta.1"
branch = "release-1.12"

[[constraint]]
name = "k8s.io/client-go"
version = "kubernetes-1.12.0-beta.1"
version = "kubernetes-1.12.0-rc.2"

[[override]]
name = "github.com/json-iterator/go"
Expand Down
116 changes: 40 additions & 76 deletions vendor/k8s.io/api/Godeps/Godeps.json

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

6 changes: 6 additions & 0 deletions vendor/k8s.io/api/autoscaling/v2beta2/generated.proto

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

19 changes: 12 additions & 7 deletions vendor/k8s.io/api/autoscaling/v2beta2/types.go

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

Loading

0 comments on commit a3aec02

Please sign in to comment.