Skip to content

Commit 0d7fd3f

Browse files
Merge pull request #2383 from AkihiroSuda/vendor-cri-20180605
update cri vendor
2 parents 84bebdd + 135a4d9 commit 0d7fd3f

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

vendor.conf

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
4343
github.com/gotestyourself/gotestyourself 44dbf532bbf5767611f6f2a61bded572e337010a
4444
github.com/google/go-cmp v0.1.0
4545

46-
# #2135: cri is temporarily forked because of circular dependency. will be fixed immediately in a follow-up PR.
47-
github.com/containerd/cri 6e975823be192ad19f2ce7afcf6c57b88a991c30 https://github.com/AkihiroSuda/cri-containerd.git
46+
github.com/containerd/cri 8bcb9a95394e8d7845da1d6a994d3ac2a86d22f0
4847
github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7
4948
github.com/blang/semver v3.1.0
5049
github.com/containernetworking/cni v0.6.0

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

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/cri/pkg/client/client.go

+3-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/cri/vendor.conf

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)