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.

Sign up for GitHub

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

Jump to bottom

Version-guard Kubectl client Guestbook application test against deployments #24478

Merged
merged 1 commit into from
Apr 20, 2016
Merged

Version-guard Kubectl client Guestbook application test against deployments #24478

merged 1 commit into from
Apr 20, 2016

Conversation

ikehz
Copy link
Contributor

@ikehz ikehz commented Apr 19, 2016

Cherry pick of #24342.

@ikehz ikehz added area/test area/upgrade release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 19, 2016
@ikehz ikehz mentioned this pull request Apr 19, 2016
Merged
@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 19, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 19, 2016

GCE e2e build/test passed for commit d15e8b7.

@roberthbailey roberthbailey added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Apr 19, 2016
@roberthbailey
Copy link
Contributor

Did you change the title? Why doesn't it say "Automated cherry pick of #24342."?

@ikehz ikehz changed the title Version-guard Kubectl client Guestbook application test against deployments Automated cherry pick of #24342 Apr 19, 2016
@ikehz
Copy link
Contributor Author

ikehz commented Apr 19, 2016

@roberthbailey Oh, because I didn't use the auto-cherry-pick tool. Fixed.

@zmerlynn
Copy link
Member

Why did you skip the tool?

@zmerlynn zmerlynn added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Apr 20, 2016
@zmerlynn zmerlynn merged commit 7e0315e into kubernetes:release-1.2 Apr 20, 2016
@ikehz
Copy link
Contributor Author

ikehz commented Apr 20, 2016

Why did you skip the tool?

Laziness. It wasn't going to be a clean cherry pick anyway because of the framework package change, so I just did it by hand. Took 60 seconds rather than 4 minutes. 😨

@david-mcmahon
Copy link
Contributor

Since more tooling is relying on the state provided by the cherry_pick_pull.sh tool, lets stick to using that. If changes do get applied directly to a release branch, do not attempt to make the PR look like it came from the tool ("Automated cherrypick") because they will not get deref'd back to a master PR.
See also https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes

@david-mcmahon david-mcmahon changed the title Automated cherry pick of #24342 Version-guard Kubectl client Guestbook application test against deployments Apr 21, 2016
@ikehz
Copy link
Contributor Author

ikehz commented Apr 21, 2016

Ack.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@zmerlynn
Merge pull request kubernetes#24478 from ihmccreery/cherry-pick-24342…
5dac8ae 
…-1.2

Automated cherry pick of kubernetes#24342
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@zmerlynn
Merge pull request kubernetes#24478 from ihmccreery/cherry-pick-24342…
e644648 
…-1.2

Automated cherry pick of kubernetes#24342
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Feb 12, 2020
@k8s-publishing-bot
Merge pull request kubernetes#24478 from huffmanca/read_vsphere_config
c334716 
Bug 1722672: UPSTREAM: 82027: Enabled reading config files for vsphere e2e tests

Origin-commit: bbdc9740ce8f64283035d4fce105abb6b89634ea
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@zmerlynn zmerlynn

Labels
area/test area/upgrade cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ikehz @k8s-bot @roberthbailey @zmerlynn @david-mcmahon @k8s-teamcity-mesosphere @googlebot @k8s-github-robot