John Mulhausen
57 lines
1.7 KiB
Markdown
57 lines
1.7 KiB
Markdown
---
|
|
layout: docwithnav
|
|
title: "Overview"
|
|
---
|
|
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
|
|
|
|
|
|
<!-- END MUNGE: UNVERSIONED_WARNING -->
|
|
|
|
# Overview
|
|
|
|
This document explains cherry picks are managed on release branches within the
|
|
Kubernetes projects.
|
|
|
|
## Propose a Cherry Pick
|
|
|
|
Any contributor can propose a cherry pick of any pull request, like so:
|
|
|
|
{% highlight sh %}
|
|
{% raw %}
|
|
hack/cherry_pick_pull.sh upstream/release-3.14 98765
|
|
{% endraw %}
|
|
{% endhighlight %}
|
|
|
|
This will walk you through the steps to propose an automated cherry pick of pull
|
|
#98765 for remote branch `upstream/release-3.14`.
|
|
|
|
## Cherry Pick Review
|
|
|
|
Cherry pick pull requests are reviewed differently than normal pull requests. In
|
|
particular, they may be self-merged by the release branch owner without fanfare,
|
|
in the case the release branch owner knows the cherry pick was already
|
|
requested - this should not be the norm, but it may happen.
|
|
|
|
[Contributor License Agreements](http://releases.k8s.io/release-1.1/CONTRIBUTING.md) is considered implicit
|
|
for all code within cherry-pick pull requests, ***unless there is a large
|
|
conflict***.
|
|
|
|
## Searching for Cherry Picks
|
|
|
|
Now that we've structured cherry picks as PRs, searching for all cherry-picks
|
|
against a release is a GitHub query: For example,
|
|
[this query is all of the v0.21.x cherry-picks](https://github.com/kubernetes/kubernetes/pulls?utf8=%E2%9C%93&q=is%3Apr+%22automated+cherry+pick%22+base%3Arelease-0.21)
|
|
|
|
|
|
|
|
|
|
<!-- BEGIN MUNGE: IS_VERSIONED -->
|
|
<!-- TAG IS_VERSIONED -->
|
|
<!-- END MUNGE: IS_VERSIONED -->
|
|
|
|
|
|
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
|
|
[]()
|
|
<!-- END MUNGE: GENERATED_ANALYTICS -->
|
|
|