whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated the links of cherrypick guide (#14348)

Browse Source
This commit is contained in:
Yang Li
2019-05-16 19:51:43 +08:00
committed by Kubernetes Prow Robot
parent caca9c6976
commit 38fcbeb49c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/contribute/generate-ref-docs/contribute-upstream.md
+1 -1
View File
@@ -193,7 +193,7 @@ Recall that your pull request has two commits: one for editing `types.go`
and one for the files generated by scripts. The next step is to propose a cherry pick of your first
commit into the release-1.9 branch. The idea is to cherry pick the commit that edited `types.go`, but not
the commit that has the results of running the scripts. For instructions, see
[Propose a Cherry Pick](https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md).
[Propose a Cherry Pick](https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md).
{{< note >}}
Proposing a cherry pick requires that you have permission to set a label and a milestone in your
content/en/docs/contribute/generate-ref-docs/kubectl.md
+1 -1
View File
@@ -126,7 +126,7 @@ cherry picked into the release branch.
For example, suppose the master branch is being used to develop Kubernetes 1.10,
and you want to backport your change to the release-1.9 branch. For instructions
on how to do this, see
[Propose a Cherry Pick](https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md).
[Propose a Cherry Pick](https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md).
Monitor your cherry-pick pull request until it is merged into the release branch.
content/fr/docs/contribute/generate-ref-docs/kubernetes-api.md
+1 -1
View File
@@ -182,7 +182,7 @@ Par exemple, supposons que la branche principale soit utilisée pour développer
Rappelez-vous que votre pull request a deux commits: un pour l'édition `types.go` et un pour les fichiers générés par des scripts.
La prochaine étape consiste à proposer un cherry pick de votre premier commit dans la branche release-1.9.
L'idée est de cherry pick le commit qui a édité `types.go`, mais pas le commit qui a pour résultat l'exécution des scripts.
Pour les instructions, voir [Propose un Cherry Pick](https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md).
Pour les instructions, voir [Propose un Cherry Pick](https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md).
{{< note >}}
Proposer un cherry pick nécessite que vous ayez la permission de définir un label et un milestone dans votre pull request.