From 4432d2271b932fee7cd256e8b7d3e62c2d294f55 Mon Sep 17 00:00:00 2001 From: David McMahon Date: Fri, 18 Mar 2016 15:20:45 -0700 Subject: [PATCH] Update with release-1.2. --- docs/devel/cherry-picks.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/devel/cherry-picks.md b/docs/devel/cherry-picks.md index 7fbcc93a8b7..fa261be4669 100644 --- a/docs/devel/cherry-picks.md +++ b/docs/devel/cherry-picks.md @@ -55,14 +55,14 @@ If you are cherrypicking a change which adds a doc, then you also need to run 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: +To cherrypick PR 123456 to release-1.2, 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 checkout -b automated-cherry-pick-of-#123456-upstream-release-1.2 + origin/automated-cherry-pick-of-#123456-upstream-release-1.2 +$ ./build/versionize-docs.sh release-1.2 $ git commit -a -m "Running versionize docs" -$ git push origin automated-cherry-pick-of-#123456-upstream-release-1.1 +$ git push origin automated-cherry-pick-of-#123456-upstream-release-1.2 ``` ## Cherry Pick Review