Merge pull request #1043 from aba182/v0.10.0-documentation

remove "list" typo from daemonset file

Documentation/kube-flannel.yml

@@ -109,7 +109,7 @@ spec:
         args:
         - -f
         - /etc/kube-flannel/cni-conf.json
-        - /etc/cni/net.d/10-flannel.conflist
+        - /etc/cni/net.d/10-flannel.conf
         volumeMounts:
         - name: cni
           mountPath: /etc/cni/net.d