1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #28243 from andrewhsu/change-context

use "golang.org/x/net/context" instead of "context"
This commit is contained in:
Sebastiaan van Stijn 2016-11-10 19:13:56 +01:00 committed by GitHub
commit 02918908af

View file

@ -2,7 +2,6 @@ package swarm
import ( import (
"bufio" "bufio"
"context"
"fmt" "fmt"
"io" "io"
"strings" "strings"
@ -13,6 +12,7 @@ import (
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
"golang.org/x/net/context"
) )
func newUnlockCommand(dockerCli *command.DockerCli) *cobra.Command { func newUnlockCommand(dockerCli *command.DockerCli) *cobra.Command {