diff options
| author | Nikhil Jindal <nikhiljindal@google.com> | 2016-01-04 14:30:45 -0800 |
|---|---|---|
| committer | Nikhil Jindal <nikhiljindal@google.com> | 2016-01-04 14:30:45 -0800 |
| commit | fdb075410fa21350c02b2e7556ab32d261a0515d (patch) | |
| tree | 1b4022c86f5ea49002c68a69e53bc311c12b9f1d | |
| parent | 4f4703bb1ad27a90b4d6263d34843159b126fd7c (diff) | |
| parent | 3d4cf50dd255c732440474b1ddf70e96a65c8f77 (diff) | |
Merge pull request #18864 from nikhiljindal/updateCPDoc
Adding instructions to run versionize-docs in cherrypick doc
| -rw-r--r-- | cherry-picks.md | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/cherry-picks.md b/cherry-picks.md index 711f1233..6f5aa5a9 100644 --- a/cherry-picks.md +++ b/cherry-picks.md @@ -48,6 +48,23 @@ hack/cherry_pick_pull.sh upstream/release-3.14 98765 This will walk you through the steps to propose an automated cherry pick of pull #98765 for remote branch `upstream/release-3.14`. +### Cherrypicking a doc change + +If you are cherrypicking a change which adds a doc, then you also need to run +`build/versionize-docs.sh` in the release branch to versionize that doc. +Ideally, just running `hack/cherry_pick_pull.sh` should be enough, but we are not there +yet: [#18861](https://github.com/kubernetes/kubernetes/issues/18861) + +To cherrypick PR 123456 to release-1.1, run the following commands after running `hack/cherry_pick_pull.sh` and before merging the PR: + +``` +$ git checkout -b automated-cherry-pick-of-#123456-upstream-release-1.1 + origin/automated-cherry-pick-of-#123456-upstream-release-1.1 +$ ./build/versionize-docs.sh release-1.1 +$ git commit -a -m "Running versionize docs" +$ git push origin automated-cherry-pick-of-#123456-upstream-release-1.1 +``` + ## Cherry Pick Review Cherry pick pull requests are reviewed differently than normal pull requests. In |