Skip to content

Commit a79c691

Browse files
estespestesp
authored
Merge pull request #3015 from thaJeztah/1.1_bump_cri
[release/1.1] update containerd/cri to f0b5665a959119b6a6234001e6d55206d9200e95
2 parents 878924b + 38bf6c5 commit a79c691

12 files changed

Lines changed: 226 additions & 68 deletions

File tree

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ github.com/gotestyourself/gotestyourself 44dbf532bbf5767611f6f2a61bded572e337010
4444
github.com/google/go-cmp v0.1.0
4545

4646
# cri dependencies
47-
github.com/containerd/cri bad0ae1102e1bf9e53876f75eacc42bc97cfb557 # release/1.0
47+
github.com/containerd/cri f0b5665a959119b6a6234001e6d55206d9200e95 # release/1.0
4848
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
4949
github.com/blang/semver v3.1.0
5050
github.com/containernetworking/cni v0.6.0

‎vendor/github.com/containerd/cri/pkg/server/container_create.go‎

Lines changed: 22 additions & 14 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_status.go‎

Lines changed: 14 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_stop.go‎

Lines changed: 28 additions & 15 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/events.go‎

Lines changed: 11 additions & 7 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/helpers.go‎

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

0 commit comments

Comments
 (0)