Преглед изворни кода

Revert "tech: use context package over xperimental version"

This reverts commit 99f1c30071e770a30abfb86b00e5aaf2dd150253.
bergquist пре 9 година
родитељ
комит
70b36a02af
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      pkg/api/login_oauth.go
  2. 1 1
      pkg/social/social.go

+ 1 - 1
pkg/api/login_oauth.go

@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/http"
 	"net/url"
 	"net/url"
 
 
-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2"
 
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"

+ 1 - 1
pkg/social/social.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"net/http"
 	"strings"
 	"strings"
 
 
-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2"
 
 
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/setting"