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

Merge pull request #7723 from smarterclayton/metrics_fails_on_mac

Browse Source 
Metrics tests can't run on Mac
This commit is contained in:
Alex Robinson
2015-05-04 13:44:59 -07:00
parent bb82fbb24f c8e0f4d2ae
commit f1666dacd6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/metrics_test.go
View File

@@ -1,4 +1,4 @@
// +build integration,!no-etcd
// +build integration,!no-etcd,linux
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
@@ -30,6 +30,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/golang/glog"
"github.com/golang/protobuf/proto"
prometheuspb "github.com/prometheus/client_model/go"