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

Update kubernetes to 0caa20c65f147e15f5545862510eb7e81c42b0a3.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-02-07 22:34:37 +00:00
parent 047df7aca6
commit ae85d0ee81
185 changed files with 4602 additions and 34221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/k8s.io/kubernetes/pkg/kubelet/remote/utils.go generated vendored
View File

@@ -22,7 +22,7 @@ import (
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// getContextWithTimeout returns a context with timeout.