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

Automated cherry pick of #15475 #20534

Conversation

bprashanth
Copy link
Contributor

Cherry pick of #15475 on release-1.1.

update

update mode

delete /tmp

update

use ioutil.TempDir instead of static tmp dir

use ioutil.TempDir instead of static tmp dir
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@bprashanth
Copy link
Contributor Author

For #20503

@bprashanth
Copy link
Contributor Author

@jijun2 askin on googlebots behest (#20534 (comment)), are you ok with cherrypicking your unittest fix to the 1.1 branch?

@ixdy
Copy link
Member

ixdy commented Feb 3, 2016

Should probably cherry-pick #20111 too.

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 3, 2016
@bprashanth
Copy link
Contributor Author

@ixdy that doesn't rebase cleanly. Can i get this one and send a follow up pr for that? (since I expect using hardcoded paths to be the main source of flake)

@k8s-bot
Copy link

k8s-bot commented Feb 3, 2016

GCE e2e build/test failed for commit 7447d8d.

@k8s-bot
Copy link

k8s-bot commented Feb 17, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@ixdy
Copy link
Member

ixdy commented Feb 17, 2016

Should we cherry-pick this to 1.1? @ihmccreery @jlowdermilk

@j3ffml
Copy link
Contributor

j3ffml commented Feb 17, 2016

If it will fix cni_test flakes we've seen on the 1.1 branch, I'd say it's worth cherrypicking. Changes are all test code, so should be very low risk.

@j3ffml
Copy link
Contributor

j3ffml commented Feb 17, 2016

@k8s-bot ok to test

@k8s-bot
Copy link

k8s-bot commented Feb 17, 2016

GCE e2e build/test failed for commit 7447d8d.

@bprashanth
Copy link
Contributor Author

@k8s-bot test this github issue #15493

@k8s-bot
Copy link

k8s-bot commented Feb 18, 2016

GCE e2e test build/test passed for commit 7447d8d.

@ixdy ixdy added lgtm "Looks good to me", indicates that a PR is ready to be merged. cla: human-approved labels Feb 19, 2016
@ixdy
Copy link
Member

ixdy commented Feb 19, 2016

LGTM

@bprashanth
Copy link
Contributor Author

How do we handle the cla complaint? I cc'd original author @jijun2 in #20534 (comment) but I think he's unavailable. Safe to ignore?

@ixdy
Copy link
Member

ixdy commented Feb 19, 2016

The original PR (#15475) shows @jijun2 accepting the CLA, so I think we're OK.

@bprashanth
Copy link
Contributor Author

So just hand merge? since sq won't pick it up

@ixdy
Copy link
Member

ixdy commented Feb 19, 2016

SQ should pick this up eventually.

@bprashanth
Copy link
Contributor Author

ah, cla:human-approved. Missed that.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Feb 19, 2016

GCE e2e test build/test passed for commit 7447d8d.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Feb 19, 2016
…5475-upstream-release-1.1

Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit 7518f0e into kubernetes:release-1.1 Feb 19, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…pick-of-#15475-upstream-release-1.1

Auto commit by PR queue bot
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…pick-of-#15475-upstream-release-1.1

Auto commit by PR queue bot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. 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

8 participants