mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
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:
commit
3fa44312ad
@ -1,4 +1,4 @@
|
||||
// +build !linux,!windows
|
||||
// +build !linux,!windows linux,!cgo
|
||||
|
||||
/*
|
||||
Copyright 2015 The Kubernetes Authors.
|
||||
|
Loading…
Reference in New Issue
Block a user