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

Merge pull request #1864 from docker/revert-1841-use-buildtin-package-context

Revert "use builtin package context rather than vendored one"
This commit is contained in:
Madhu Venugopal 2017-07-28 13:03:51 -07:00 committed by GitHub
commit 5a9b20ed3a
2 changed files with 2 additions and 3 deletions

View file

@ -1,9 +1,8 @@
package cluster
import (
"context"
"github.com/docker/docker/api/types/network"
"golang.org/x/net/context"
)
const (

View file

@ -2,7 +2,6 @@ package main
import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
@ -37,6 +36,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
"github.com/gorilla/mux"
"golang.org/x/net/context"
)
const (