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
+1 -1
View File
@@ -300,6 +300,6 @@ Check that:
{% capture whatsnext %}
* If you need assistance, use one of the [support channels](/docs/tasks/debug-application-cluster/troubleshooting/) to seek assistance.
* For details about use cases that motivated this work, see
[Federation proposal](https://git.k8s.io/community/contributors/design-proposals/federation.md).
[Federation proposal](https://git.k8s.io/community/contributors/design-proposals/federation/federation.md).
{% endcapture %}
{% include templates/task.md %}