Fix conflict at dev-1.13-ja.2 #14464
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
cstoku
commented
May 22, 2019
•
cstoku
commented
- fix conflict
- fix commit messages
* Translation Partners * Missing files * Wording * Removed unnecessary files
* Kubernets blog: 'The Future of Cloud Providers in Kubernetes' Signed-off-by: Andrew Sy Kim <[email protected]> * Update future-of-cloud-providers.md
…13743) Signed-off-by: Alexander Brand <[email protected]>
Adding new contrib ambassador role to k8s with details of the role and responsibilities.
* deploy and index * Updated wording * fixed links
Adjusting Portuguese translations on content/pt/_index.html
* doc headlines / community / contribute * Wording * Added missing space * Changed word
fixed the invalid link referred by "this guide" in "In Kubernetes v1.11.0 and later, you can use kubeadm upgrade diff to see the changes that would be applied to static pod manifests." this is fix for issue #13869
* fix indent * fix broken indent
changed the order in sample yaml file. Resole the issue #13862
These statement was intended to specify environment variable values available in the container but word 'environment variable' was missing so corrected these statements for better clarity.
* Fix shortcodes in rkt glossary entry * Tweak wording of rkt glossary entry
* fix a word order issue * Normalize heading language
* Add formal definition of workloads * Update workload.md * add light copyedit More section should not repeat short description. Both are served together on the built page.
Changes the key name to `SPECIAL_LEVEL` in the config map volume definition. This is consistent with the rest of the example. Otherwise, this pod does not start because there is no key with that name in the `special-config` config map.
#13882) * Create Introducing-kube-iptables-tailer-Better-Networking-Visibility-in-Kubernetes-Clusters.md * Update Introducing-kube-iptables-tailer-Better-Networking-Visibility-in-Kubernetes-Clusters.md
* updated link for framework file Fixed the invalid link referred by "framework file" in "Most of the common code are located in the framework file that leaves only one function to be implemented for different conversions.". This fix is for the issue #13759 . * updated framework file link reference to v1.14 changed docs version from v1.13.0 to v1.14.0 in the link reference "framework file" -> https://github.com/kubernetes/kubernetes/tree/v1.14.0/test/images/crd-conversion-webhook/converter/framework.go
* Adding k3s information * Adding k3s information * Add K3s information. * Change Rancher 2.0 to Rancher * Update content/en/docs/setup/pick-right-solution.md per suggestion by @sftim Co-Authored-By: JasonvanBrackel <[email protected]>
Bob is now an Xoogler and now longer involved in the Kubernetes project regularly. Remove him from the blog.
* Provides snippet for PLEG * Define more resource usage monitoring solutions * Clarification on create-cluster * Revert "Clarification on create-cluster" This reverts commit 42061be. * copyedit
* Revise guide for generating reference docs This PR changes the guidance for generating reference documentation for Kubernetes API and kubernetes components. The topic of making changes to the upstream repo is separated out because 1) it is not a mandatory step for generating the reference docs; 2) it is about a more advanced level of documentation fix. * light copyedit * more light copyedits
remove extra '*' from the end of the aritcle； or they have other meanings :D
The following links where broken * AZURE * GCE * AWS In case of GCE I assume it changed to GCP, but please confirm if that is correct.
* document pod downwardAPI fieldRef & resourceRef values of en version * document pod downwardAPI fieldRef & resourceRef values of zh version * typo correction
* Link upgrade to skewed version page It provides the order of upgrade and shows which versions are supported. Solves (at least partially ) #14420 * Update cluster-management.md * Update cluster-management.md
Flag --export has been deprecated, This flag is deprecated and will be removed in future.
* add pod preset page for language/id * fix formatting * fix typos and wording * fix formatting and add few missed lines * fix note formatting
Update apiVersion on ingress to extensions/v1beta1
k8s-ci-robot
added
the
do-not-merge/invalid-commit-message
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: If they are not already assigned, you can assign the PR to them by writing 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 |
k8s-ci-robot
added
the
size/XXL
k8s-ci-robot
added
cncf-cla: yes
|
Deploy preview for kubernetes-io-master-staging ready! Built with commit 7bde1aa https://deploy-preview-14464--kubernetes-io-master-staging.netlify.com |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.