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

Jump to bottom

Correct the article in generated documents #32557

Merged
merged 1 commit into from
Nov 1, 2016
Merged

Correct the article in generated documents #32557

merged 1 commit into from
Nov 1, 2016

Conversation

asalkeld
Copy link

@asalkeld asalkeld commented Sep 13, 2016 •
edited
Loading

What this PR does / why we need it:
Fix the article in generated docs for "create/delete [article] [kind]"

Which issue this PR fixes
fixes #32305

Special notes for your reviewer:
None

Release note:

Correct the article in generated documents

For example:
"a Ingress" > "an Ingress"

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Sep 13, 2016
@k8s-bot
Copy link

k8s-bot commented Sep 13, 2016

GCE e2e build/test passed for commit 1cece91573e8eb1e542b1352743f79ad49a45564.

@brendandburns brendandburns added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Sep 16, 2016
@brendandburns
Copy link
Contributor

LGTM, thanks for doing this!

@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 20, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit 1cece91573e8eb1e542b1352743f79ad49a45564.

The magic incantation to run this job again is @k8s-bot gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 22, 2016
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 4, 2016
@pigmej
Copy link
Contributor

pigmej commented Oct 6, 2016

@brendandburns @asalkeld aren't that swagger spec autogenerated? It will be overwritten when anyone will regenerate it, isn't it?

Please see #32278 (comment)

asalkeld
asalkeld commented Oct 6, 2016
View reviewed changes
pkg/apiserver/api_installer.go
if hasSubresource {
doc = "delete " + subresource + " of a " + kind
doc = "delete " + subresource + " of" + article + kind
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pigmej here is the actual code change. The other stuff is checked in, but not edited by hand (./hack/update-all.sh)

@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 20, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 9f228d0853711faf0290471af51dee16386d4205. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2016
@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit f580c59509ebbc4b1f484da8189cb9e3e91e3843. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@asalkeld
Copy link
Author

Sorry about the noise on this, but I had to rebase and make a bazel BUILD file change.

@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Oct 26, 2016
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GCE e2e failed for commit 2e37ec97914c8e74c205a2ee98ba5c82f3d26e9a. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@nikhiljindal
Copy link
Contributor

Thanks a lot @asalkeld for fixing this!
Adding back LGTM.

GCE failure seems to be a flake. Retrying
@k8s-bot gci gce e2e test this

@nikhiljindal nikhiljindal added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 28, 2016
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2016
Correct the article in generated documents
3a08cf0 
For example:

  "a Ingress" > "an Ingress"
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 31, 2016
@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 1, 2016
@brendandburns
Copy link
Contributor

LGTM (again)

This has got to be the longest small change PR in history... Sorry for the delay!

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit a9b183d into kubernetes:master Nov 1, 2016
@chentao1596 chentao1596 mentioned this pull request Dec 5, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brendandburns brendandburns

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use "an" instead of "a" before an ingress in auto generated API documentation
8 participants
@asalkeld @k8s-bot @brendandburns @k8s-ci-robot @pigmej @nikhiljindal @k8s-github-robot @googlebot