Merge pull request #160 from Random-Liu/update-ocicni

Vendor ocicni from upstream.
containerd · Aug 23, 2017 · 07e3a2b · 07e3a2b
2 parents dd6e9fb + 4250035
commit 07e3a2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -3,7 +3,7 @@ github.com/boltdb/bolt v1.3.0-58-ge9cf4fa
 github.com/containerd/containerd f79981c2dfe35c3bfcbdd2de9b682e8c3de904b2 
 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
 github.com/containernetworking/cni v0.6.0
-github.com/cri-o/ocicni 3bb422584a0755d73718085e0edc355619b5973e https://github.com/Random-Liu/ocicni.git
+github.com/cri-o/ocicni 0f90d35d89e9ab7e972a9edeb36b0aaffa250335
 github.com/davecgh/go-spew v1.1.0
 github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
 github.com/docker/docker cc4da8112814cdbb00dbf23370f9ed764383de1f

diff --git a/vendor/github.com/cri-o/ocicni/ocicni.go b/vendor/github.com/cri-o/ocicni/ocicni.go