Merge pull request #7723 from smarterclayton/metrics_fails_on_mac

Metrics tests can't run on Mac
kubernetes · May 4, 2015 · f1666da · f1666da
2 parents bb82fbb + c8e0f4d
commit f1666da
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go
@@ -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"