Merge pull request #1083 from coreos/revert-1043-v0.10.0-documentation

Revert "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.conf
+        - /etc/cni/net.d/10-flannel.conflist
         volumeMounts:
         - name: cni
           mountPath: /etc/cni/net.d