Merge pull request #19323 from sjenning/carry-disable-lsi

UPSTREAM: <carry>: disable local storage isolation feature gate
openshift · Apr 23, 2018 · 0d1477f · 0d1477f
2 parents 162e99d + 9269438
commit 0d1477f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 53 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status_test.go