Merge pull request #23519 from sttts/sttts-mac-test-compile

Auto commit by PR queue bot

contrib/mesos/pkg/flagutil/cadvisor.go

@@ -19,10 +19,6 @@ package flagutil
 import (
 	"flag"
 
-	// TODO(jdef) kill this once cadvisor flags are no longer configured by
-	// global variables. Importing it this way guarantees that the global flag
-	// variables are initialized.
-	_ "github.com/google/cadvisor/manager"
 	// kubelet attempts to customize default values for some cadvisor flags, so
 	// make sure that we pick these up.
 	_ "k8s.io/kubernetes/pkg/kubelet/cadvisor"

contrib/mesos/pkg/flagutil/cadvisor_linux.go

@@ -0,0 +1,24 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package flagutil
+
+import (
+	// TODO(jdef) kill this once cadvisor flags are no longer configured by
+	// global variables. Importing it this way guarantees that the global flag
+	// variables are initialized.
+	_ "github.com/google/cadvisor/manager"
+)