github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ef73bb684b
kubernetes/cmd/kube-controller-manager/app/options
History
Kubernetes Submit Queue 5232ad4a00
Merge pull request #65917 from dims/remove-stray-comment-from-merge 
Automatic merge from submit-queue (batch tested with PRs 64664, 65836, 65917). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove stray comment from a merge

Signed-off-by: Davanum Srinivas <davanum@gmail.com>



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

Remove stray comment from a merge.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-07-09 08:07:04 -07:00
..
attachdetachcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
BUILD Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
csrsigningcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
daemonsetcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
deploymentcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
deprecatedcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
endpointcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
garbagecollectorcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
hpacontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
jobcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
namespacecontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
nodeipamcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
nodelifecyclecontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
options_test.go Merge pull request #65917 from dims/remove-stray-comment-from-merge 2018-07-09 08:07:04 -07:00
options.go kube-controller-manager: create self-signed certs 2018-07-05 15:53:42 +02:00
persistentvolumebindercontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
podgccontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
replicasetcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
replicationcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
resourcequotacontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00
serviceaccountcontroller.go move some option struct from controller manager to kube-controller manager 2018-06-19 17:58:48 +08:00