From 3f3a95ef3e35730a62073fcb9067d24505da0045 Mon Sep 17 00:00:00 2001
From: Andrew Hsu <andrewhsu@docker.com>
Date: Thu, 10 Nov 2016 08:23:19 -0800
Subject: [PATCH] use "golang.org/x/net/context" instead of "context"

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: dc32cb6c772869d401a9af6f50ccefa77f555252
Component: cli
---
 components/cli/command/swarm/unlock.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/cli/command/swarm/unlock.go b/components/cli/command/swarm/unlock.go
index 51b06d6267..048fb56e3d 100644
--- a/components/cli/command/swarm/unlock.go
+++ b/components/cli/command/swarm/unlock.go
@@ -2,7 +2,6 @@ package swarm
 
 import (
 	"bufio"
-	"context"
 	"fmt"
 	"io"
 	"strings"
@@ -13,6 +12,7 @@ import (
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
+	"golang.org/x/net/context"
 )
 
 func newUnlockCommand(dockerCli *command.DockerCli) *cobra.Command {