Revert "tech: use context package over xperimental version"

This reverts commit 99f1c300.

Revert "tech: use context package over xperimental version"
This reverts commit 99f1c300.
70b36a02 · bergquist · 99f1c300 · 70b36a02 · 70b36a02
Commit 70b36a02 authored Feb 20, 2017 by bergquist
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

pkg/api/login_oauth.go
+1 -1

pkg/social/social.go
+1 -1

No files found.
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/url"

-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"

 	"github.com/grafana/grafana/pkg/bus"

--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"

-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"

 	"github.com/grafana/grafana/pkg/setting"