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.

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

[First merge update] Merged master into dev 1.17 #17133

Merged
merged 251 commits into from
Oct 23, 2019
Merged

[First merge update] Merged master into dev 1.17 #17133

merged 251 commits into from
Oct 23, 2019

Conversation

daminisatya
Copy link
Contributor

@daminisatya daminisatya commented Oct 23, 2019

dpandhi-git and others added 30 commits September 22, 2019 20:21
The wiki page referenced has been removed. Removing the like here will stop some beginner confusion (take it from me I am a beginner).
* Change title to add Startup probe

* renamed task file to reflect title change

* changed intro sentence to add startup probe
Without this change `curl hello-world.info` will return a 404
Issue #16453: Added missing in-pod Python client information;
Fixed broken link to external Python client example
* initial commit

* promote AWS-NLB Support from alpha to beta (#14451) (#16459) (#16484)

* 1. Sync release-1.15 into master
2. Sync with en version

* 1. Add the lost yaml file.
#16284)

* Translate docs/tasks/administer-cluster/running-cloud-controller/ in Japanese

* Update content/ja/docs/tasks/administer-cluster/running-cloud-controller.md

Co-Authored-By: Naoki Oketani <[email protected]>

* Update content/ja/docs/tasks/administer-cluster/running-cloud-controller.md

Co-Authored-By: Naoki Oketani <[email protected]>

* Update content/ja/docs/tasks/administer-cluster/running-cloud-controller.md

Co-Authored-By: Naoki Oketani <[email protected]>

* Update content/ja/docs/tasks/administer-cluster/running-cloud-controller.md

Co-Authored-By: Naoki Oketani <[email protected]>

* Changed: リーダーエレクション -> リーダー選出

* Update content/ja/docs/tasks/administer-cluster/running-cloud-controller.md

Co-Authored-By: Naoki Oketani <[email protected]>

* Update content/ja/docs/tasks/administer-cluster/running-cloud-controller.md

Co-Authored-By: Naoki Oketani <[email protected]>
- add processing of kubectl links in update-imported-docs.
- update component reference generation guide.
- For more information, see issue #16454.
* initial commit

* promote AWS-NLB Support from alpha to beta (#14451) (#16459) (#16484)

* 1. Sync release-1.15 into master
2. Sync with en version

* 1. Add the lost yaml file.

* Update he cluster administration folder of concepts
1. Sync with 1.14 branch
2. Sync with en version

* Add yaml files which are used
The `*.profile` file referenced do not need to be provided in a separate
file. Making them separate files is preventing hugo from correctly
building the site.
* initial commit

* promote AWS-NLB Support from alpha to beta (#14451) (#16459) (#16484)

* 1. Sync release-1.15 into master
2. Sync with en version

* 1. Add the lost yaml file.

* Update he cluster administration folder of concepts
1. Sync with 1.14 branch
2. Sync with en version

* Add yaml files which are used

* 1. Sync the configuration folder from 1.14 version
2. Sync the configuration folder files with en version
3. Changed some files structure for easily review
4. Add glossary folder for fixup build error
Add references to the Content guide where the Style guide was
mentioned.
Update the Contribute page (_index.md)
Make Style and Content linkable everywhere
Changed bullet list to numbered list in Content Guide to make referring
to sections easier.
Reverted change to bullet list - beyond scope of this PR

Signed-off-by: Aimee Ukasick <[email protected]>
Enhance to emphasize that triagers should add a priority to each
issue.
Add Learn about Prow section

Signed-off-by: Aimee Ukasick <[email protected]>
Also added a section about creating volumes from snapshots.
`kubectl config view -o jsonpath='{.users[].name}' ` in the doc doesn't get the list of users as described in the comment actually.
To get the list of users, the json path should be `'{.users[].name}' `
@k8s-ci-robot k8s-ci-robot added language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. kind/support Categorizes issue or PR as a support question. labels Oct 23, 2019
@daminisatya
Copy link
Contributor Author

/milestone 1.17
/tide merge-method-merge

@daminisatya
Copy link
Contributor Author

/assign @zacharysarah
/assign @jimangel
/assign @simplytunde

@zacharysarah
Copy link
Contributor

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2019
@daminisatya
Copy link
Contributor Author

/cncf-cla yes

@daminisatya
Copy link
Contributor Author

@zacharysarah @jimangel not sure why it is missing cla label.

@simplytunde
Copy link
Contributor

/check-cla
/lgtm

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 23, 2019
@simplytunde
Copy link
Contributor

@daminisatya should be fixed now

@k8s-ci-robot k8s-ci-robot merged commit f947a75 into kubernetes:dev-1.17 Oct 23, 2019
@daminisatya
Copy link
Contributor Author

awesome! Now I get the correct label. Thank you @simplytunde

@daminisatya daminisatya deleted the merged-master-dev-1.17 branch October 23, 2019 08:00
@daminisatya daminisatya restored the merged-master-dev-1.17 branch October 23, 2019 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/blog Issues or PRs related to the Kubernetes Blog subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/support Categorizes issue or PR as a support question. language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.