Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Manual cherrypick master branch changes to release-9.0 #752

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

Merged
merged 5 commits into from
Feb 8, 2019

Conversation

roycaihw
Copy link
Member

@roycaihw roycaihw commented Feb 8, 2019

changes in master branch got dropped by git pull -s ours when we merge master branch into release-9.0: #751

basically the 14th commit ("Merge branch 'master' of github.com:kubernetes-client/python into re") in https://github.com/kubernetes-client/python/pull/751/commits is empty, which means the 1~13 commits didn't get into release-9.0

this PR manually cherrypicked the 1~13 commits from https://github.com/kubernetes-client/python/pull/751/commits into release-9.0 branch to make sure the changes will be included in 9.0.0b1

  • (ignored five merge commits from robot and squashed four of my commits into one "update base submodule", so there are only five commits in this PR)

double checked the version constants and ran the script to re-generate the client. confirmed that nothing changes

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 8, 2019
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 8, 2019
@roycaihw
Copy link
Member Author

roycaihw commented Feb 8, 2019

/assign @yliaog

@yliaog
Copy link
Contributor

yliaog commented Feb 8, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 8, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roycaihw, yliaog

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 686d64c into kubernetes-client:release-9.0 Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants