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,6 +1,6 @@
---
title: Configure the aggregation layer
approvers:
reviewers:
- lavalamp
- cheftako
- chenopis
@@ -1,6 +1,6 @@
---
title: Extend the Kubernetes API with CustomResourceDefinitions
approvers:
reviewers:
- deads2k
- enisoc
---
@@ -1,5 +1,5 @@
---
approvers:
reviewers:
- enisoc
- IanLewis
title: Extend the Kubernetes API with ThirdPartyResources
@@ -1,6 +1,6 @@
---
title: Migrate a ThirdPartyResource to CustomResourceDefinition
approvers:
reviewers:
- enisoc
- deads2k
---
@@ -1,6 +1,6 @@
---
title: Setup an extension API server
approvers:
reviewers:
- lavalamp
- cheftako
- chenopis