Merge pull request #665 from davidmccormick/master

Explicit operator: Exists to allow toleration on masters

Documentation/kube-flannel.yml

@@ -50,6 +50,7 @@ spec:
         beta.kubernetes.io/arch: amd64
       tolerations:
       - key: node-role.kubernetes.io/master
+        operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       containers: