Merge branch 'master' into crio-v1.13.0

pull/3515/head
Thomas Stromberg 2019-01-10 11:44:20 -08:00
commit 5dab8fa319
1 changed files with 1 additions and 1 deletions

View File

@ -6,6 +6,6 @@ metadata:
annotations:
storageclass.beta.kubernetes.io/is-default-class: "true"
labels:
addonmanager.kubernetes.io/mode: Reconcile
addonmanager.kubernetes.io/mode: EnsureExists
provisioner: k8s.io/minikube-hostpath