merge master to 1.10, with fixes (#7682)

This commit is contained in:
Jennifer Rondeau
2018-03-08 14:03:55 -05:00
committed by k8s-ci-robot
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
+1 -1
View File
@@ -10,5 +10,5 @@ repos:
dst: docs/imported/community/guide.md
- src: mentoring/README.md
dst: docs/imported/community/mentoring.md
- src: keps/1-kubernetes-enhancement-proposal-process.md
- src: keps/0001-kubernetes-enhancement-proposal-process.md
dst: docs/imported/community/keps.md