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

Merge pull request #1841 from allencloud/use-buildtin-package-context

Browse source 
use builtin package context rather than vendored one
This commit is contained in:
Santhosh Manohar 2017-07-13 10:20:18 -07:00 committed by GitHub
commit f6163048e1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnetwork/cluster/provider.go
View file

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

2
libnetwork/cmd/dnet/dnet.go
View file

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