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 ```

Merge pull request #65917 from dims/remove-stray-comment-from-merge
5232ad4a · Kubernetes Submit Queue · GitHub · e049c458 · 1eccc2f5 · 5232ad4a
Unverified Commit 5232ad4a authored Jul 09, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

options_test.go cmd/kube-controller-manager/app/options/options_test.go +1 -1

No files found.
--- a/cmd/kube-controller-manager/app/options/options_test.go
+++ b/cmd/kube-controller-manager/app/options/options_test.go
@@ -139,7 +139,7 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		KubeCloudShared: &cmoptions.KubeCloudSharedOptions{
-			Port:    10252,     // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config		 +				AllocateNodeCIDRs:         true,
+			Port:    10252,     // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 			Address: "0.0.0.0", // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 			UseServiceAccountCredentials: true,
 			RouteReconciliationPeriod:    metav1.Duration{Duration: 30 * time.Second},