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.
This commit is contained in:
Kubernetes Submit Queue 2017-01-12 21:32:39 -08:00 committed by GitHub
commit 3fa44312ad

View File

@ -1,4 +1,4 @@
// +build !linux,!windows
// +build !linux,!windows linux,!cgo
/*
Copyright 2015 The Kubernetes Authors.