Merge branch 'master' into release-1.12

This commit is contained in:
zacharysarah
2018-10-17 19:10:16 -07:00
558 changed files with 71868 additions and 2594 deletions
@@ -1,3 +1,8 @@
---
title: federation-controller-manager
notitle: true
---
## federation-controller-manager
@@ -51,4 +56,4 @@ federation-controller-manager [flags]
--zone-name string Zone name, like example.com.
```
###### Auto generated by spf13/cobra on 24-Sep-2018
###### Auto generated by spf13/cobra on 24-Sep-2018