From 99f1c30071e770a30abfb86b00e5aaf2dd150253 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 20 Feb 2017 21:44:15 +0100 Subject: [PATCH] tech: use context package over xperimental version --- pkg/api/login_oauth.go | 2 +- pkg/social/social.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 2bf9c484803..e4f8cae1fd6 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -12,7 +12,7 @@ import ( "net/http" "net/url" - "golang.org/x/net/context" + "context" "golang.org/x/oauth2" "github.com/grafana/grafana/pkg/bus" diff --git a/pkg/social/social.go b/pkg/social/social.go index 860d068957e..5b966973be4 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "golang.org/x/net/context" + "context" "golang.org/x/oauth2" "github.com/grafana/grafana/pkg/setting"