Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically cherry-pick #47113 #47226

Closed
wants to merge 3 commits into from

Conversation

feiskyer
Copy link
Member

@feiskyer feiskyer commented Jun 9, 2017

What this PR does / why we need it:

Automatically cherry-pick #47113.

Which issue this PR fixes

fixes #47012

Special notes for your reviewer:

Release note:

CRI has been moved to package `pkg/kubelet/apis/cri/v1alpha1/runtime`.

/assign @yujuhong @dchen1107

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 9, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: feiskyer
We suggest the following additional approver: dchen1107

Assign the PR to them by writing /assign @dchen1107 in a comment when ready.

Associated issue: 47113

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

This PR is not for the master branch but does not have the cherrypick-approved label. Adding the do-not-merge label.

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 9, 2017
@yujuhong
Copy link
Contributor

yujuhong commented Jun 9, 2017

Don't think this is needed. The branch manager @caesarxuchao is keeping 1.7 branch in sync with the master.

@feiskyer
Copy link
Member Author

feiskyer commented Jun 9, 2017

@yujuhong Thanks. Then this PR should be closed.

@feiskyer feiskyer closed this Jun 9, 2017
@caesarxuchao
Copy link
Member

caesarxuchao commented Jun 9, 2017

Right. Cherry-pick to release-1.7 is only needed after we lift the code freeze.

@feiskyer feiskyer deleted the cri-1.7 branch December 5, 2017 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants