golang.org/x/net/context -> context

Change-Id: I520c1779dcbc62bfa2cbe847e39c93836ab67ae7 Signed-off-by: Jake Sanders <jsand@google.com>
GoogleCloudPlatform · Nov 15, 2016 · 4dc1f23 · 4dc1f23
1 parent 7496c35
commit 4dc1f23
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/cli/clear.go b/cli/clear.go
@@ -15,13 +15,13 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
 
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/store"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 type clearCmd struct {

diff --git a/cli/config.go b/cli/config.go
@@ -15,6 +15,7 @@
 package cli
 
 import (
+	"context"
 	"encoding/csv"
 	"errors"
 	"flag"
@@ -24,7 +25,6 @@ import (
 
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/config"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 const (

diff --git a/cli/configure-docker.go b/cli/configure-docker.go
@@ -15,6 +15,7 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -29,7 +30,6 @@ import (
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/cliconfig/configfile"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 type dockerConfigCmd struct {

diff --git a/cli/dockerHelper.go b/cli/dockerHelper.go
@@ -15,6 +15,7 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -24,7 +25,6 @@ import (
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/store"
 	"github.com/docker/docker-credential-helpers/credentials"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 type helperCmd struct {

diff --git a/cli/gcr-login.go b/cli/gcr-login.go
@@ -15,14 +15,14 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
 
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/auth"
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/store"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 type loginCmd struct {

diff --git a/cli/gcr-logout.go b/cli/gcr-logout.go
@@ -15,13 +15,13 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
 
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/store"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 type logoutCmd struct {

diff --git a/cli/version.go b/cli/version.go
@@ -15,13 +15,13 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
 
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/config"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 type versionCmd struct {

diff --git a/main.go b/main.go
@@ -21,12 +21,12 @@ See README.md
 package main
 
 import (
+	"context"
 	"flag"
 	"os"
 
 	"github.com/GoogleCloudPlatform/docker-credential-gcr/cli"
 	"github.com/google/subcommands"
-	"golang.org/x/net/context"
 )
 
 const (