vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1324 from mrunalp/update_k8s

Browse source 
Update k8s
This commit is contained in:
Antonio Murdaca 2018-02-22 09:52:14 +01:00 • committed by GitHub
commit 1c540236d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
792 changed files with 25023 additions and 19841 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oci/container.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/pkg/signal"
specs "github.com/opencontainers/runtime-spec/specs-go"
"k8s.io/apimachinery/pkg/fields"
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
const (