merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
@@ -135,7 +135,7 @@ system:serviceaccount:<namespace>:default
 {"apiVersion":"abac.authorization.kubernetes.io/v1beta1","kind":"Policy","spec":{"user":"system:serviceaccount:kube-system:default","namespace":"*","resource":"*","apiGroup":"*"}}
 ```

-需要重新启动 apitorver 以获取新的策略行.
+需要重新启动 apiserver 以获取新的策略行.

 {% endcapture %}
 {% include templates/concept.md %}