k3s/cmd/kube-controller-manager
Kubernetes Submit Queue 9d079c467e Merge pull request #47040 from zjj2wry/controller-manager
Automatic merge from submit-queue

controller-manager: fix horizontal-pod-autoscaler-use-rest-clients fl…

…ag help info



**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2017-07-08 14:53:51 -07:00
..
app Merge pull request #47040 from zjj2wry/controller-manager 2017-07-08 14:53:51 -07:00
BUILD Convert go_binary linkstamp to x_defs 2017-06-08 14:59:55 -07:00
OWNERS Remove krousey from some OWNERS files 2017-03-10 11:12:29 -08:00
controller-manager.go copy pkg/util/logs to apiserver 2017-02-13 12:07:15 -05:00