Merge pull request #7723 from smarterclayton/metrics_fails_on_mac

Metrics tests can't run on Mac
This commit is contained in:
Alex Robinson 2015-05-04 13:44:59 -07:00
commit f1666dacd6

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"