Skip to content

Commit a160857

Browse files
wkingrh-atomic-bot
authored andcommitted
vendor.conf: Bump CNI to v0.6.0
Neither the nominal version nor vendored content had changed since a031b83 (Initial checkin from CRI-O repo, 2017-11-01): $ git ls-tree origin/master -- vendor/github.com/containernetworking/cni 040000 tree 744c091 vendor/github.com/containernetworking/cni $ git ls-tree a031b83 -- vendor/github.com/containernetworking/cni 040000 tree 744c091 vendor/github.com/containernetworking/cni $ git grep /cni a031b83 -- vendor.conf a031b83:vendor.conf:github.com/containernetworking/cni v0.4.0 I'm not quite sure which upstream version the old vendored content came from, but it certainly wasn't v0.4.0. I've bumped our nominal version to v0.6.0 and re-vendored with: $ vndr github.com/containernetworking/cni $ git add -A vendor/github.com/containernetworking/cni to generate this commit. The only change to the vendored content is text in the README (unlikely to break anything ;), and sitting on an upstream tag is nice, so I think this is good enough. Signed-off-by: W. Trevor King <[email protected]> Closes: #750 Approved by: mheon
1 parent cc1bad8 commit a160857

File tree

2 files changed

+37
-22
lines changed

2 files changed

+37
-22
lines changed

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ github.com/boltdb/bolt master
88
github.com/buger/goterm 2f8dfbc7dbbff5dd1d391ed91482c24df243b2d3
99
github.com/containerd/cgroups 7a5fdd8330119dc70d850260db8f3594d89d6943
1010
github.com/containerd/continuity master
11-
github.com/containernetworking/cni v0.4.0
11+
github.com/containernetworking/cni v0.6.0
1212
github.com/containernetworking/plugins master
1313
github.com/containers/image 88423e35d5f11939b0db4fb8f2939fc04adf2463
1414
github.com/containers/storage e454acf9874d6c399ccb87d03fc4dcbe8c1a4cc6

vendor/github.com/containernetworking/cni/README.md

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

0 commit comments

Comments
 (0)