IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6113 from replay/fix_context_dependency

Browse Source 
Fix context dependency
This commit is contained in:
Carl Bergquist 2016-09-23 06:43:32 +02:00 committed by GitHub
commit 696a5f6a80
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tsdb/prometheus/prometheus.go
View File

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