Merge master into release-1.10

This commit is contained in:
Andrew Chen
2018-03-16 16:29:38 -07:00
24 changed files with 341 additions and 42 deletions
+1 -1
View File
@@ -219,7 +219,7 @@ endpoints. You can switch to the new reconciler by adding the flag
{% include feature-state-alpha.md %}
If you want to know more, you can check the following resources:
- [issue kubernetes/kuberenetes#22609](https://github.com/kubernetes/kubernetes/issues/22609),
- [issue kubernetes/kubernetes#22609](https://github.com/kubernetes/kubernetes/issues/22609),
which gives additional context
- [master/reconcilers/mastercount.go](https://github.com/kubernetes/kubernetes/blob/dd9981d038012c120525c9e6df98b3beb3ef19e1/pkg/master/reconcilers/mastercount.go#L63),
the implementation of the master count reconciler