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

Merge pull request #85 from Random-Liu/update-cri

Browse Source 
Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd.
This commit is contained in:
Lantao Liu
2017-06-21 13:18:24 -07:00
committed by GitHub
parent 4d7735567c 862d00a21c
commit 78b74a6a58
54 changed files with 3218 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/service.go
View File

@@ -30,7 +30,7 @@ import (
"github.com/docker/docker/pkg/truncindex"
"github.com/kubernetes-incubator/cri-o/pkg/ocicni"
healthapi "google.golang.org/grpc/health/grpc_health_v1"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata"
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata/store"