Merge pull request #7519 from tanjunchen/modify-doc-small-mistake

modify-doc-small-mistake
kubernetes · Sep 7, 2019 · 093e17a · 093e17a
2 parents 69a31b7 + ee32102
commit 093e17a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/apireference/build/node_modules/jquery.scrollto/CHANGELOG.md b/docs/apireference/build/node_modules/jquery.scrollto/CHANGELOG.md
diff --git a/docs/apireference/build/node_modules/marked/README.md b/docs/apireference/build/node_modules/marked/README.md
diff --git a/docs/releases/1.11-NOTES.md b/docs/releases/1.11-NOTES.md
@@ -286,7 +286,7 @@ None known at this time
 * Update Calico to v3.3.1 [@caseydavenport](https://github.com/caseydavenport) [#6077](https://github.com/kubernetes/kops/pull/6077)
 * delete some code [@xichengliudui](https://github.com/xichengliudui) [#6078](https://github.com/kubernetes/kops/pull/6078)
 * Adding describe launch config to autoscaler permissions [@brosander](https://github.com/brosander) [#5929](https://github.com/kubernetes/kops/pull/5929)
-* Remove trailing comma from from k8s-1.7-v3.yaml.template [@Smirl](https://github.com/Smirl) [#6086](https://github.com/kubernetes/kops/pull/6086)
+* Remove trailing comma from k8s-1.7-v3.yaml.template [@Smirl](https://github.com/Smirl) [#6086](https://github.com/kubernetes/kops/pull/6086)
 * Updating image and docs for metrics-server add-on [@Cryptophobia](https://github.com/Cryptophobia) [#5873](https://github.com/kubernetes/kops/pull/5873)
 * Updates to roadmap for 1.11 and 1.12 and new upcoming features section (WIP) [@geojaz](https://github.com/geojaz) [#5824](https://github.com/kubernetes/kops/pull/5824)
 * Update amazon-vpc-routed-eni to v1.2.1 [@adammw](https://github.com/adammw) [#5905](https://github.com/kubernetes/kops/pull/5905)

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go
@@ -53,7 +53,7 @@ func (t *LaunchTemplate) RenderAWS(c *awsup.AWSAPITarget, a, ep, changes *Launch
 	}
 	lc := input.LaunchTemplateData
 
-	// @step: add the the actual block device mappings
+	// @step: add the actual block device mappings
 	rootDevices, err := t.buildRootDevice(c.Cloud)
 	if err != nil {
 		return err