Merge branch 'master' into release-1.8

This commit is contained in:
steveperry-53
2017-09-21 15:28:28 -07:00
49 changed files with 253 additions and 97 deletions
@@ -163,9 +163,9 @@ Tracked at [#26120](https://github.com/kubernetes/kubernetes/issues/26120)
{% capture whatsnext %}
[Design Doc 1](https://git.k8s.io/community/contributors/design-proposals/garbage-collection.md)
[Design Doc 1](https://git.k8s.io/community/contributors/design-proposals/api-machinery/garbage-collection.md)
[Design Doc 2](https://git.k8s.io/community/contributors/design-proposals/synchronous-garbage-collection.md)
[Design Doc 2](https://git.k8s.io/community/contributors/design-proposals/api-machinery/synchronous-garbage-collection.md)
{% endcapture %}