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 #23223 #23456

Conversation

mikedanese
Copy link
Member

Cherry pick of #23223 on release-1.2.

@mikedanese
Copy link
Member Author

cc @david-mcmahon @davidopp

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 24, 2016
@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
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 24, 2016
@mikedanese mikedanese added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 24, 2016
@davidopp
Copy link
Member

LGTM

@davidopp davidopp added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 24, 2016
@bgrant0607 bgrant0607 removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 24, 2016
@bgrant0607
Copy link
Member

Tests failed. Also, the original PR hasn't even merged into master yet.

@mikedanese
Copy link
Member Author

this is a new one for me:

+++ [0324 15:25:36] Placing binaries
+ godep go install ./...
godep: [WARNING]: godep should only be used inside a valid go package directory and
godep: [WARNING]: may not function correctly. You are probably outside of your $GOPATH.
godep: [WARNING]:   Current Directory: /workspace/kubernetes
godep: [WARNING]:   $GOPATH: /go
+ ./hack/install-etcd.sh
curl: (18) transfer closed with 6395410 bytes remaining to read

gzip: stdin: unexpected end of file
tar: Unexpected EOF in archive
tar: Unexpected EOF in archive
tar: Error is not recoverable: exiting now
!!! Error in /workspace/kubernetes/hack/lib/etcd.sh:71
  'tar xzf -' exited with status 18 2

@k8s-bot unit test this please issue: #IGNORE

@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 the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 24, 2016
@bgrant0607
Copy link
Member

verify-godeps is failing in master.

@k8s-bot
Copy link

k8s-bot commented Mar 24, 2016

GCE e2e build/test passed for commit 3c14a6d.

@eparis
Copy link
Contributor

eparis commented Mar 24, 2016

godep: [WARNING]: godep should only be used inside a valid go package directory and
godep: [WARNING]: may not function correctly. You are probably outside of your $GOPATH.
godep: [WARNING]:   Current Directory: /workspace/kubernetes
godep: [WARNING]:   $GOPATH: /go

Is meaningless and should be ignored. (Those are the ONLY 4 lines I'm saying this about however)

@davidopp
Copy link
Member

Why did the bot add "do-not-merge" label? There are no doc changes here.

@eparis
Copy link
Contributor

eparis commented Mar 25, 2016

I believe the bot said why it did it: #23456 (comment)

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

@bgrant0607
Copy link
Member

@davidopp See #23456 (comment)

@davidopp davidopp added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Mar 26, 2016
@davidopp
Copy link
Member

So am I allowed to add cherrypick-approved, or do we wait until whoever is doing them as a batch does them all at once? We definitely want this in 1.2.1

@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 the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 26, 2016
@eparis
Copy link
Contributor

eparis commented Mar 26, 2016

@bgrant0607 has been adding the label. We should ask him to review this / #23223

@bgrant0607 bgrant0607 added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 26, 2016
@bgrant0607 bgrant0607 added this to the v1.2 milestone Mar 26, 2016
@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 the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 26, 2016
@bgrant0607 bgrant0607 added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 26, 2016
@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 Mar 26, 2016

GCE e2e build/test passed for commit 3c14a6d.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit b58fd6e into kubernetes:release-1.2 Mar 26, 2016
@mikedanese mikedanese deleted the automated-cherry-pick-of-#23223-upstream-release-1.2 branch March 27, 2016 01:13
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…pick-of-#23223-upstream-release-1.2

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

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
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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants