From 136327ac5a8aa5b0746bb4bca2b75d9d633a7f92 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: 2de83a430d5d3f82346cafa15f4bd1f7c47dde12
Component: engine
---
 components/engine/cli/command/swarm/unlock.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/engine/cli/command/swarm/unlock.go b/components/engine/cli/command/swarm/unlock.go
index 51b06d6267..048fb56e3d 100644
--- a/components/engine/cli/command/swarm/unlock.go
+++ b/components/engine/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 {