Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ad68688a
Commit
ad68688a
authored
Jan 04, 2016
by
Nikhil Jindal
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18864 from nikhiljindal/updateCPDoc
Adding instructions to run versionize-docs in cherrypick doc
parents
2cd8bff3
15606961
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
0 deletions
+17
-0
cherry-picks.md
docs/devel/cherry-picks.md
+17
-0
No files found.
docs/devel/cherry-picks.md
View file @
ad68688a
...
@@ -48,6 +48,23 @@ hack/cherry_pick_pull.sh upstream/release-3.14 98765
...
@@ -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
This will walk you through the steps to propose an automated cherry pick of pull
#98765 for remote branch
`upstream/release-3.14`
.
#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 Review
Cherry pick pull requests are reviewed differently than normal pull requests. In
Cherry pick pull requests are reviewed differently than normal pull requests. In
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment