Skip to content

Commit eac100a

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #3548 from Random-Liu/update-cri
Update cri to f1d492b.
2 parents c62b744 + 9cbd18a commit eac100a

67 files changed

Lines changed: 1737 additions & 1101 deletions

Some content is hidden

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

‎vendor.conf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,30 @@ github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
4242
gotest.tools v2.3.0
4343
github.com/google/go-cmp v0.2.0
4444
go.etcd.io/bbolt v1.3.3
45+
github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
46+
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
4547

4648
# cri dependencies
47-
github.com/containerd/cri b213648c5bd0a1d2ee42709c10dff63fbfee3ad7 # master
48-
github.com/containerd/go-cni 22460c018b64cf8bf4151b3ff9c4d077e6a88cbf
49-
github.com/containernetworking/cni v0.6.0
50-
github.com/containernetworking/plugins v0.7.0
51-
github.com/davecgh/go-spew v1.1.0
49+
github.com/containerd/cri f1d492b0cdd14e76476ee4dd024696ce3634e501 # master
50+
github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1
51+
github.com/containernetworking/cni v0.7.1
52+
github.com/containernetworking/plugins v0.7.6
53+
github.com/davecgh/go-spew v1.1.1
5254
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
5355
github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
5456
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
5557
github.com/emicklei/go-restful v2.2.1
56-
github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
57-
github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
58-
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
58+
github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1
5959
github.com/json-iterator/go 1.1.5
6060
github.com/modern-go/reflect2 1.0.1
6161
github.com/modern-go/concurrent 1.0.3
6262
github.com/opencontainers/selinux v1.2.2
6363
github.com/seccomp/libseccomp-golang v0.9.1
6464
github.com/tchap/go-patricia v2.2.6
6565
golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
66-
golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
66+
golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a
6767
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
68-
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
68+
gopkg.in/inf.v0 v0.9.0
6969
gopkg.in/yaml.v2 v2.2.1
7070
k8s.io/api kubernetes-1.15.0
7171
k8s.io/apimachinery kubernetes-1.15.0

‎vendor/github.com/containerd/cri/README.md‎

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

‎vendor/github.com/containerd/cri/cri.go‎

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

‎vendor/github.com/containerd/cri/pkg/config/config.go‎

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

‎vendor/github.com/containerd/cri/pkg/containerd/opts/container.go‎

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

‎vendor/github.com/containerd/cri/pkg/containerd/opts/spec.go‎

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

‎vendor/github.com/containerd/cri/pkg/log/log.go‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)