Merge pull request #35817 from luxas/fix_crossbuild

Automatic merge from submit-queue Fix cadvisor_unsupported and the crossbuild Resolves a bug in the `cadvisor_unsupported.go` code. Fixes https://github.com/kubernetes/kubernetes/issues/35735 Introduced by: https://github.com/kubernetes/kubernetes/pull/35136 We should consider to cherrypick this as #35136 also was cherrypicked cc @kubernetes/sig-testing @vishh @dashpole @jessfraz ```release-note Fix cadvisor_unsupported and the crossbuild ```

Merge pull request #35817 from luxas/fix_crossbuild
5eefdb92 · Kubernetes Submit Queue · GitHub · 58457daf · 00fda679 · 5eefdb92
Commit 5eefdb92 authored Oct 28, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cadvisor_unsupported.go pkg/kubelet/cadvisor/cadvisor_unsupported.go +1 -1

No files found.
--- a/pkg/kubelet/cadvisor/cadvisor_unsupported.go
+++ b/pkg/kubelet/cadvisor/cadvisor_unsupported.go
@@ -31,7 +31,7 @@ type cadvisorUnsupported struct {

 var _ Interface = new(cadvisorUnsupported)

-func New(port uint, runtime string) (Interface, error) {
+func New(port uint, runtime string, rootPath string) (Interface, error) {
 	return &cadvisorUnsupported{}, nil
 }