merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent 7f40782850
commit 3d79703d23
60 changed files with 26896 additions and 762 deletions
@@ -32,7 +32,12 @@ toc:
  - docs/reference/workloads-18-19.md

 - title: API Reference
+<<<<<<< HEAD
  landing_page: /docs/reference/generated/kubernetes-api/v1.10/
+||||||| merged common ancestors
+=======
+  landing_page: /docs/api-reference/v1.8/
+>>>>>>> merge master to 1.10, with fixes (#7682)
  section:
  - title: v1.10
    path: /docs/reference/generated/kubernetes-api/v1.10/