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

Copy edits for typos #16525

Merged
merged 1 commit into from
Dec 22, 2015
Merged

Copy edits for typos #16525

merged 1 commit into from
Dec 22, 2015

Conversation

epc
Copy link
Contributor

@epc epc commented Oct 29, 2015

CLA signed previously.
/hack/update-generated-docs.sh run.

@k8s-bot
Copy link

k8s-bot commented Oct 29, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

1 similar comment
@k8s-bot
Copy link

k8s-bot commented Oct 29, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added kind/design Categorizes issue or PR as related to design. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 29, 2015
@wojtek-t
Copy link
Member

@k8s-bot ok to test

@wojtek-t
Copy link
Member

@k8s-bot unit test this please

@k8s-bot
Copy link

k8s-bot commented Oct 29, 2015

GCE e2e test build/test passed for commit 98a71a68f8f7e6a269a69461f95801a6682789fa.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 5, 2015
@epc
Copy link
Contributor Author

epc commented Nov 19, 2015

I just rebased this, didn't notice it hadn't been merged until this morning.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 19, 2015

GCE e2e test build/test passed for commit 88c0f385f2b6630158618f4c9ed6dadcf74c170a.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 24, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 25, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

2 similar comments
@k8s-bot
Copy link

k8s-bot commented Dec 13, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@k8s-bot
Copy link

k8s-bot commented Dec 13, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@wojtek-t
Copy link
Member

@epc - please rebase

@k8s-bot
Copy link

k8s-bot commented Dec 13, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@epc
Copy link
Contributor Author

epc commented Dec 13, 2015

Rebased…again.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2015
@wojtek-t wojtek-t assigned wojtek-t and unassigned smarterclayton Dec 21, 2015
@wojtek-t
Copy link
Member

@k8s-bot ok to test

@wojtek-t
Copy link
Member

@epc - can you please rebase one more time (sorry for that - we had huge problems with our tests)

/workspace/kubernetes/docs/api-reference is out of date. Please run hack/update-api-reference-docs.sh

@k8s-bot
Copy link

k8s-bot commented Dec 21, 2015

GCE e2e test build/test passed for commit 12572d4750af56a0e2c02dd9976b4bc8691f7c6e.

@epc
Copy link
Contributor Author

epc commented Dec 21, 2015

You've added docker as a dependency to building the kubernetes docs? Seriously?

@epc
Copy link
Contributor Author

epc commented Dec 21, 2015

Rebased & reran both ./hack/verify-generated-docs.sh and ./hack/update-generated-docs.sh.
The first time I ran update-generated-docs.sh it complained that I didn't have docker installed, but after running verify-generated-docs.sh first then it proceeded w/o complaint (I still don't have docker installed).

@k8s-bot
Copy link

k8s-bot commented Dec 21, 2015

GCE e2e test build/test passed for commit 4e6b5089d1eb54a222ed58884cd16315894d7625.

@k8s-bot
Copy link

k8s-bot commented Dec 21, 2015

GCE e2e build/test failed for commit 4eca171e62900c7fca8617afbdd9b24a34ffa74c.

@wojtek-t
Copy link
Member

I'm afraid it's still not solved:

/workspace/kubernetes/docs/api-reference is out of date. Please run hack/update-api-reference-docs.sh
FAILED

@wojtek-t
Copy link
Member

What you really need to run is
hack/update-api-reference-dosc.sh

@epc
Copy link
Contributor Author

epc commented Dec 22, 2015

Rebased, reinstalled docker, re-ran hack/update-api-reference-docs.sh, re-pushed branch.

@wojtek-t
Copy link
Member

@epc - thanks; looks much better now

LGTM - thanks for your change!

@wojtek-t wojtek-t added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 22, 2015
@k8s-bot
Copy link

k8s-bot commented Dec 22, 2015

GCE e2e test build/test passed for commit f968c59.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

brendandburns added a commit that referenced this pull request Dec 22, 2015
@brendandburns
Merge pull request #16525 from epc/epc-2015302
670adb7 
Copy edits for typos
@brendandburns brendandburns merged commit 670adb7 into kubernetes:master Dec 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@wojtek-t wojtek-t

Labels
kind/design Categorizes issue or PR as related to design. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@epc @k8s-bot @k8s-github-robot @wojtek-t @k8s-teamcity-mesosphere @smarterclayton @googlebot @brendandburns