github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
parent 31483bf546 92a429887a
commit 3fa44312ad
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cadvisor/cadvisor_unsupported.go
View File

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