Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 5ad95b2

Browse files
authored
Merge pull request #833 from Random-Liu/update-containerd-k8s
Update containerd and k8s.
2 parents bc99f7a + 88c5165 commit 5ad95b2

File tree

111 files changed

+6122
-4545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+6122
-4545
lines changed

vendor.conf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ github.com/blang/semver v3.1.0
33
github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
44
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
55
github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
6-
github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925
6+
github.com/containerd/console 9290d21dc56074581f619579c43d970b4514bc08
77
github.com/containerd/containerd 84bebdd91d347c99069d1705b7d4e6d6f746160c
88
github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b
99
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
@@ -31,10 +31,12 @@ github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
3131
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
3232
github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
3333
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
34-
github.com/json-iterator/go 1.0.4
34+
github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682
3535
github.com/matttproud/golang_protobuf_extensions v1.0.0
3636
github.com/Microsoft/go-winio v0.4.7
3737
github.com/Microsoft/hcsshim v0.6.11
38+
github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
39+
github.com/modern-go/concurrent 1.0.3
3840
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
3941
github.com/opencontainers/image-spec v1.0.1
4042
github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340
@@ -67,9 +69,9 @@ google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
6769
google.golang.org/grpc v1.12.0
6870
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
6971
gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77
70-
k8s.io/api aac5d23ea3ca7132d75daeed7516f8205553c832
71-
k8s.io/apimachinery 521145febf93d5639dce48a49ee8dc080863b034
72-
k8s.io/apiserver 0553b9748924ffb5737340cb0afa6f0de2b12c42
73-
k8s.io/client-go 6fd8d2ef33ca9a0d821c9d66c23793cc8603d897
74-
k8s.io/kubernetes v1.11.0-beta.2
75-
k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e
72+
k8s.io/api 9e5ffd1f1320950b238cfce291b926411f0af722
73+
k8s.io/apimachinery ed135c5b96450fd24e5e981c708114fbbd950697
74+
k8s.io/apiserver a90e3a95c2e91b944bfca8225c4e0d12e42a9eb5
75+
k8s.io/client-go 03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb
76+
k8s.io/kubernetes v1.11.0
77+
k8s.io/utils 733eca437aa39379e4bcc25e726439dfca40fcff

vendor/github.com/containerd/console/console_linux.go

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

vendor/github.com/containerd/console/console_windows.go

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

vendor/github.com/json-iterator/go/README.md

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

vendor/github.com/json-iterator/go/feature_adapter.go renamed to vendor/github.com/json-iterator/go/adapter.go

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

0 commit comments

Comments
 (0)