github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
This commit is contained in:
Lantao Liu
2017-09-06 21:04:45 -07:00
committed by GitHub
parent 3e4b4234c6 f36ef46b35
commit 7a75a91578
11 changed files with 95 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/service.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/cri-o/ocicni"
"github.com/cri-o/ocicni/pkg/ocicni"
"github.com/golang/glog"
"google.golang.org/grpc"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"