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

Skip to content

Fix cadvisor_unsupported and the crossbuild#35817

Merged
k8s-github-robot merged 1 commit into
kubernetes:masterfrom
luxas:fix_crossbuild
Oct 29, 2016
Merged

Fix cadvisor_unsupported and the crossbuild#35817
k8s-github-robot merged 1 commit into
kubernetes:masterfrom
luxas:fix_crossbuild

Conversation

@luxas
Copy link
Copy Markdown
Member

@luxas luxas commented Oct 28, 2016

Resolves a bug in the cadvisor_unsupported.go code.
Fixes #35735

Introduced by: #35136
We should consider to cherrypick this as #35136 also was cherrypicked

cc @kubernetes/sig-testing @vishh @dashpole @jessfraz

Fix cadvisor_unsupported and the crossbuild

This change is Reviewable

@luxas luxas added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. labels Oct 28, 2016
@luxas luxas added this to the v1.4 milestone Oct 28, 2016
@luxas
Copy link
Copy Markdown
Member Author

luxas commented Oct 28, 2016

@k8s-bot build this

@ixdy
Copy link
Copy Markdown
Contributor

ixdy commented Oct 28, 2016

/lgtm

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 28, 2016
@luxas luxas assigned ixdy and unassigned yujuhong Oct 28, 2016
@luxas luxas added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 28, 2016
@jessfraz jessfraz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 28, 2016
@jessfraz jessfraz added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 28, 2016
jessfraz added a commit that referenced this pull request Oct 28, 2016
@jessfraz
Copy link
Copy Markdown
Contributor

I merged this into 1.4 already to get the release done today along with #35136 so removing the cherry-pick candidate label

@jessfraz jessfraz removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Oct 28, 2016
@jessfraz jessfraz removed this from the v1.4 milestone Oct 28, 2016
@jessfraz jessfraz self-assigned this Oct 28, 2016
@jessfraz jessfraz added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Oct 28, 2016
var _ Interface = new(cadvisorUnsupported)

func New(port uint, runtime string) (Interface, error) {
func New(port uint, runtime string, rootPath string) (Interface, error) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: these input arguments can be ignored. Use _ instead :)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, sure, but didn't want to break the pattern :)

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Jenkins GCE Node e2e failed for commit 00fda67. Full PR test history.

The magic incantation to run this job again is @k8s-bot node e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@dashpole
Copy link
Copy Markdown
Contributor

@k8s-bot node e2e test this

@k8s-github-robot
Copy link
Copy Markdown

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

@k8s-github-robot
Copy link
Copy Markdown

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 5eefdb9 into kubernetes:master Oct 29, 2016
jessfraz added a commit to jessfraz/kubernetes that referenced this pull request Nov 1, 2016
…herry-pick-of-#35136-kubernetes#35817-origin-release-1.4"

This reverts commit 7964708, reversing
changes made to b7ad318.
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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

Development

Successfully merging this pull request may close these issues.

9 participants