Merge pull request #38631 from ncdc/fix-kubelet-cadvisor-build-tags

Automatic merge from submit-queue Fix cadvisor_unsupported.go build tags Make it so cadvisor_unsupported.go is used for linux without cgo or non-linux/windows OSes.

Merge pull request #38631 from ncdc/fix-kubelet-cadvisor-build-tags
3fa44312 · Kubernetes Submit Queue · GitHub · 31483bf5 · 92a42988 · 3fa44312
Commit 3fa44312 authored Jan 12, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 12, 2017
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
-// +build !linux,!windows
+// +build !linux,!windows linux,!cgo
 /*
 Copyright 2015 The Kubernetes Authors.