Merge pull request kubernetes#9 from s-urbaniak/cni-fix

rootfs: fix wrong default location of k8s CNI configuration
s-urbaniak · Sep 8, 2016 · b693ba7 · b693ba7
2 parents 33c9fd2 + 39d8a00
commit b693ba7
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/...ube/rootfs-overlay/etc/cni/net.d/k8s.conf → ...ernetes/kubelet-plugins/net/exec/k8s.conf b/...ube/rootfs-overlay/etc/cni/net.d/k8s.conf → ...ernetes/kubelet-plugins/net/exec/k8s.conf