Sync between master dev 1.18 #19117
Merged
Sync between master dev 1.18 #19117
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
* Fixed outdated ECR credential debug message
The log message for troubleshooting kubelet auto fetching ECR credentils issue has been changed (noticed since 1.14), and the new message reads like this when verbose log level is set to 3:
- `aws_credentials.go:109] unable to get ECR credentials from cache, checking ECR API`
- `aws_credentials.go:116] Got ECR credentials from ECR API for <Your ECR AWS Account ID>.dkr.ecr.us-east-1.amazonaws.com`
This is based on the kubelet source code:
https://github.com/kubernetes/kubernetes/blob/release-1.14/pkg/credentialprovider/aws/aws_credentials.go#L91
This PR is to fix this and to avoid confusion for more people who are troubleshooting the kubelet ECR issue.
* Update content/en/docs/concepts/containers/images.md
Co-Authored-By: Tim Bannister <[email protected]>
Co-authored-by: Tim Bannister <[email protected]>
* Translate concepts/services-networking/connect-applications-service/ into Japanese (kubernetes#17710) * Translate concepts/services-networking/connect-applications-service/ into Japanese * Apply review * Translate content/ja/docs/tasks/_index.md into Japanese (kubernetes#17789) * add task index * huge page * ja-docs: Update kops Installation Steps (kubernetes#17804) * Update /ja/docs/tasks/tools/install-minikube/ (kubernetes#17711) * Update /ja/docs/tasks/tools/install-minikube/ * Apply review * Apply review * Update content/ja/docs/tasks/tools/install-minikube.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/tools/install-minikube.md Co-Authored-By: inductor <[email protected]> * Translate tasks/configure-pod-container/assign-cpu-resource/ in Japanese (kubernetes#16160) * copy from content/en/docs/tasks/configure-pod-container/ to ja * translate assign-cpu-resource.md in Japanese * Update content/ja/docs/tasks/configure-pod-container/assign-cpu-resource.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/configure-pod-container/assign-cpu-resource.md Co-Authored-By: Naoki Oketani <[email protected]> * Update assign-cpu-resource.md ここの *request* と *limit* はほかの文中の単語とは異なり、YAMLのfieldを表すため、訳さないでおく * fix translation "Pod scheduling is based on requests." の箇所。 requestsに基づいているのは事実だが、直訳されたときになにを指すのかあいまいなので、対象を具体的に記述 * Translate concepts/workloads/controllers/deployment/ in Japanese kubernetes#14848 (kubernetes#17794) * ja-trans: Translate concepts/workloads/controllers/deployment/ into Japanese (kubernetes#14848) * ja-trans: Improve Japanese translation in concepts/workloads/controllers/deployment/ (kubernetes#14848) * ja-trans: Improve Japanese translation in concepts/workloads/controllers/deployment/ (kubernetes#14848) * ja-trans: Improve Japanese translation in concepts/workloads/controllers/deployment/ (kubernetes#14848) * little fix (kubernetes#18135) * update index (kubernetes#18136) * Update /ja/docs/setup/_index.md (kubernetes#18139) * Update /ja/docs/tasks/tools/install-kubectl/ (kubernetes#18137) * update /docs/ja/tasks/tools/install-kubectl/ * fix mongon * apply reveiw * Update /ja/docs/reference/command-line-tools-reference/feature-gates/ (kubernetes#18141) * Update feature agete * tidy up feature gates list * translate new lines * table caption * blank * する -> します * apply review * fix broken link * Update content/ja/docs/reference/command-line-tools-reference/feature-gates.md Co-Authored-By: Naoki Oketani <[email protected]> * update translation * remove line * Update content/ja/docs/reference/command-line-tools-reference/feature-gates.md Co-Authored-By: Naoki Oketani <[email protected]> * rollpack * Update /ja/docs/concepts/services-networking/service/ (kubernetes#18138) * update /ja/docs/concepts/services-networking/service/ * Update content/ja/docs/concepts/services-networking/service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/services-networking/service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/services-networking/service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/services-networking/service.md Co-Authored-By: Naoki Oketani <[email protected]> * consider Endpoints as a Kubernetes resource * full * Update content/ja/docs/concepts/_index.md (kubernetes#18145) * Update concepts * control plane * apply review * fix bold (kubernetes#18165) * Update /ja/docs/concepts/overview/components.md (kubernetes#18153) * update /ja/docs/concepts/overview/components.md * some japanese docs are already there * translate prepend * apply upstream changes (kubernetes#18278) * Translate concepts/services-networking/ingress into Japanese kubernetes#17741 (kubernetes#18234) * ja-trans: Translate concepts/services-networking/ingress into Japanese (kubernetes#17741) * ja-trans: Improve Japanese translation in concepts/services-networking/ingress (kubernetes#17741) * ja-trans: Improve Japanese translation in concepts/services-networking/ingress (kubernetes#17741) * Update pod overview in Japanese (kubernetes#18277) * Update pod-overview * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * ノード * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/concepts/workloads/pods/pod-overview.md Co-Authored-By: Naoki Oketani <[email protected]> Co-authored-by: Naoki Oketani <[email protected]> * Translate concepts/scheduling/scheduler-perf-tuning/ in Japanese kubernetes#17119 (kubernetes#17796) * ja-trans: Translate concepts/scheduling/scheduler-perf-tuning/ into Japanese (kubernetes#17119) * ja-trans: Improve Japanese translation in concepts/scheduling/scheduler-perf-tuning/ (kubernetes#17119) * ja-trans: Improve Japanese translation in concepts/scheduling/scheduler-perf-tuning/ (kubernetes#17119) * ja-trans:conetent/ja/casestudies/nav (kubernetes#18450) * Translate tasks/debug-application-cluster/debug-service/ in Japanese (kubernetes#18395) * Translate tasks/debug-application-cluster/debug-service/ in Japanese * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Change all `Pods` to `Pod` and `Endpoints` to `Endpoint` * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: inductor <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Updated content pointed out in review * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> * Apply suggestions from code review Co-Authored-By: inductor <[email protected]> * Apply suggestions from review * Apply suggestions form review * Apply suggestions from review * Apply suggestions from review * Apply suggestions from code review Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/debug-application-cluster/debug-service.md Co-Authored-By: Naoki Oketani <[email protected]> Co-authored-by: inductor <[email protected]> Co-authored-by: Naoki Oketani <[email protected]> * Translate concepts/extend-kubernetes/api-extension/custom-resources/ into Japanese (kubernetes#18200) * Translate concepts/extend-kubernetes/api-extension/custom-resources/ into Japanese * Apply suggestions from code review between L1 an L120 by oke-py Co-Authored-By: Naoki Oketani <[email protected]> * Apply suggestions from code review by oke-py Co-Authored-By: Naoki Oketani <[email protected]> * Update CustomResourceDefinition not to localize into Japanese * Revert the link to customresourcedefinitions to English Co-Authored-By: Naoki Oketani <[email protected]> * Apply suggestions from code review by oke-py and inductor Co-Authored-By: Naoki Oketani <[email protected]> Co-Authored-By: inductor <[email protected]> * Apply a suggestion from review by inductor * Apply a suggestion from code review by oke-py Co-Authored-By: Naoki Oketani <[email protected]> Co-authored-by: Naoki Oketani <[email protected]> Co-authored-by: inductor <[email protected]> * Translate tasks/configure-pod-container/quality-service-pod/ into Japanese (kubernetes#16173) * copy from content/en/docs/tasks/configure-pod-container/quality-service-pod.md to Ja * Translate tasks/configure-pod-container/quality-service-pod/ into Japanese Guaranteed, Burstable, BestEffortは用語として存在するので訳さない Signed-off-by: Takuma Hashimoto <[email protected]> * Update content/ja/docs/tasks/configure-pod-container/quality-service-pod.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/configure-pod-container/quality-service-pod.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/configure-pod-container/quality-service-pod.md Co-Authored-By: Naoki Oketani <[email protected]> * Update content/ja/docs/tasks/configure-pod-container/quality-service-pod.md Co-Authored-By: Naoki Oketani <[email protected]> Co-authored-by: Naoki Oketani <[email protected]> * Translate content/ja/docs/reference/kubectl/cheatsheet.md (kubernetes#17739) (kubernetes#18285) * Translate content/ja/docs/reference/kubectl/cheatsheet.md (kubernetes#17739) * Translated kubectl cheet sheet. * Fix typos in content/ja/docs/reference/kubectl/cheatsheet.md (kubernetes#17739) * Fix japanese style in content/ja/docs/reference/kubectl/cheatsheet.md * Fix typo in content/ja/docs/reference/kubectl/cheatsheet.md * Fix translation in content/ja/docs/reference/kubectl/cheatsheet.md * Fix typo in content/ja/docs/reference/kubectl/cheatsheet.md * Fix typo in content/ja/docs/reference/kubectl/cheatsheet.md * Modify translation for casestudies (kubernetes#18767) * modify terminology * add ten * update translation * update * update * update * fix typo (kubernetes#18769) * remove english comment (kubernetes#18770) * ja-trans:conetent/ja/casestudies/spotify (kubernetes#18451) * ja-trans: content/ja/case-studies/spotify * Update content/ja/case-studies/spotify/index.html Updated with the proposal from inductor Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Updated with inductor 's proposal Co-Authored-By: inductor <[email protected]> * ja-trans: content/ja/case-studies/spotify * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> * Update content/ja/case-studies/spotify/index.html Co-Authored-By: inductor <[email protected]> Co-authored-by: inductor <[email protected]> * Translate Japanese headers (kubernetes#18776) * translate headers * add index for references * Update content/ja/docs/setup/production-environment/tools/_index.md Co-Authored-By: Naoki Oketani <[email protected]> * translate controller Co-authored-by: Naoki Oketani <[email protected]> * ja-docs: translate install-kubeadm into Japanese (kubernetes#18198) * ja-docs: translate install-kubeadm into Japanese * translate table title in install-kubeadm to Japanese * update kubeadm install doc * remove extra spaces * fix translation miss * translate url title into japanese * fix translation miss * remove line break in sentence and translate title * remove extra line break * remove extra line break * fix translation miss Co-authored-by: Naoki Oketani <[email protected]> Co-authored-by: Samuel Kihahu <[email protected]> Co-authored-by: Takuma Hashimoto <[email protected]> Co-authored-by: Keita Akutsu <[email protected]> Co-authored-by: Masa Taniguchi <[email protected]> Co-authored-by: Soto Sugita <[email protected]> Co-authored-by: Kozzy Hasebe <[email protected]> Co-authored-by: kazuaki harada <[email protected]> Co-authored-by: Shunsuke Miyoshi <[email protected]>
Signed-off-by: Dominic Yin <[email protected]>
* Correct description of kubectl Given that `kubectl` is not a [command line interface (CLI)](https://en.wikipedia.org/wiki/Command-line_interface), I suggest calling it what it is -- a control utility (ctl = control). The term "tool" is commonly used in place of "utility," including the `kubectl` docs. A CLI presents the user with a command prompt at which the user can enter multiple command lines that a command-line interpreter interprets and processes. Think of `bash`, `emacs`, or a SQL shell. Since `kubectl` is not run in a shell, it is not a CLI. Here are related docs that correctly refer to `kubectl` as a "command-line tool": - https://kubernetes.io/docs/reference/tools/#kubectl - https://kubernetes.io/docs/reference/glossary/?fundamental=true#term-kubectl - https://kubernetes.io/docs/tasks/tools/install-kubectl/ - https://kubernetes.io/docs/reference/kubectl/kubectl/ * Update content/en/docs/reference/kubectl/overview.md Co-Authored-By: Zach Corleissen <[email protected]> Co-authored-by: Zach Corleissen <[email protected]>
Tiny fix Feedback from onlydole Add missing link Incremental fixes Revise Jim's job title Update content/en/blog/_posts/2020-01-17-Docs-Review-2019.md Co-Authored-By: Celeste Horgan <[email protected]> Feedback from celeste, change date
…ubernetes#16869) * Create Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md * Update Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Taylor Dolezal <[email protected]> * Update Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update content/en/blog/_posts/Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-Authored-By: Bob Killen <[email protected]> * Update Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md * Update Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md * Update Deploying-External-OpenStack-Cloud-Provider-With-Kubeadm.md Co-authored-by: Bob Killen <[email protected]> Co-authored-by: Taylor Dolezal <[email protected]>
…16832) * csi-ephemeral-inline-volumes: introduce CSI support for ephemeral inline volumes This was alpha in Kubernetes 1.15 and became beta in 1.16. Several CSI drivers already support it (soon...). * csi-ephemeral-inline-volumes: bump date and address feedback (NodeUnpublishVolume) * csi-ephemeral-inline-volumes: add examples and next steps * csi-ephemeral-inline-volumes: rename file, minor edits * csi-ephemeral-inline-volumes: include Docker example
…ubernetes#18062) * Create 2019-12-10-Gamified-Chaos-Engineering-Tool-for-Kubernetes.md * Update and rename 2019-12-10-Gamified-Chaos-Engineering-Tool-for-Kubernetes.md to 2019-01-16-Gamified-Chaos-Engineering-Tool-for-Kubernetes.md * Update 2019-01-16-Gamified-Chaos-Engineering-Tool-for-Kubernetes.md * Update and rename 2019-01-16-Gamified-Chaos-Engineering-Tool-for-Kubernetes.md to 2019-01-22-Gamified-Chaos-Engineering-Tool-for-Kubernetes.md Co-authored-by: Kaitlyn Barnard <[email protected]>
…dm.md (kubernetes#16869)" (kubernetes#18805) This reverts commit 2c4545e.
* add blog k8s on mips * modify english title to chinese * modify some error
…#18706) * Add French version of persistent volume page concept page * Fix * Fix * Fix * Fix
…ernetes#18069) * Followup fixes for: Add resource version section to api-concepts documentation * Apply feedback * Apply feedback * Switch paragraph to active voice
…8762) * Add additional ways to contribute part to update zh doc * Add original English text * Update content/zh/docs/contribute/_index.md Co-Authored-By: chentanjun <[email protected]> Co-authored-by: chentanjun <[email protected]>
…18430) * Add newlines to `none` VM driver docs * Add note on `none` driver in minikube installation docs Link to documentation describing possible security and data loss issues * minikube: Add caution block to `none` vm driver * Edit Debian-related minikube instructions Update section on the `none` driver.
* Reduce ambiguity on nodePort At first sight, nodePort looks a lot like service.Spec.NodePort, though it just means a port allocated from "--service-node-port-range". Replacing "nodePort" with "node port" to add some clarity. * Update content/en/docs/tasks/access-application-cluster/create-external-load-balancer.md Co-Authored-By: Tim Bannister <[email protected]> Co-authored-by: Tim Bannister <[email protected]>
This PR contains sync up between master and dev-1.18 and also reolsved merge conflicts occured during previous sync during previous sync up caused due to missed adding tide-method merge Signed-off-by: vineeth <[email protected]>
|
Deploy preview for kubernetes-io-vnext-staging processing. Building with commit 9433b26 https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5e45aca566b9810007bd7409 |
k8s-ci-robot
added
the
size/XXL
VineethReddy02
added
tide/merge-method-merge
k8s-ci-robot
added
cncf-cla: yes
k8s-ci-robot
added
language/en
|
I see the @VineethReddy02 /hold |
k8s-ci-robot
added
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
|
[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 |
k8s-ci-robot
added
the
approved
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
This was referenced Feb 21, 2020
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.
This PR contains sync up between master and dev-1.18 and also resolved merge conflicts occurred during the previous sync up caused due to missed adding tide-method merge"