Merge pull request #6113 from replay/fix_context_dependency

Fix context dependency

Merge pull request #6113 from replay/fix_context_dependency
Fix context dependency
696a5f6a · Carl Bergquist · GitHub · 66fe8867 · f7dfcb44 · 696a5f6a
Commit 696a5f6a authored Sep 23, 2016 by Carl Bergquist Committed by GitHub Sep 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

pkg/tsdb/prometheus/prometheus.go
+1 -1

No files found.
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
 package prometheus

 import (
-	"context"
 	"fmt"
 	"net/http"
 	"regexp"
@@ -11,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/tsdb"
 	"github.com/prometheus/client_golang/api/prometheus"
+	"golang.org/x/net/context"
 	pmodel "github.com/prometheus/common/model"
 )