Skip to content

Commit a6cd37e

Browse files
dmcgowandmcgowan
authored
Merge pull request #3243 from Random-Liu/update-cri
Update cri to 2fc62db.
2 parents 5bba53f + 5d17ed2 commit a6cd37e

20 files changed

Lines changed: 431 additions & 297 deletions

File tree

‎vendor.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ github.com/google/go-cmp v0.2.0
4444
go.etcd.io/bbolt v1.3.2
4545

4646
# cri dependencies
47-
github.com/containerd/cri 6d353571e64417d80c9478ffaea793714dd539d0 # master
48-
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
47+
github.com/containerd/cri 2fc62db8146ce66f27b37306ad5fda34207835f3 # master
48+
github.com/containerd/go-cni 891c2a41e18144b2d7921f971d6c9789a68046b2
4949
github.com/containernetworking/cni v0.6.0
5050
github.com/containernetworking/plugins v0.7.0
5151
github.com/davecgh/go-spew v1.1.0

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

Lines changed: 29 additions & 6 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: 13 additions & 10 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/server/container_remove.go‎

Lines changed: 3 additions & 0 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/server/container_start.go‎

Lines changed: 72 additions & 42 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/server/container_stop.go‎

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

0 commit comments

Comments
 (0)