Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modify-doc-small-mistake #7519

Merged
merged 1 commit into from
Sep 7, 2019
Merged

modify-doc-small-mistake #7519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/apireference/build/node_modules/jquery.scrollto/CHANGELOG.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/apireference/build/node_modules/marked/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/releases/1.11-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down