diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2018-04-19 15:30:59 -0700 |
|---|---|---|
| committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2018-04-23 13:52:44 -0700 |
| commit | 7d62e40f7e4f3c17d229a7687d6fcca5448de813 (patch) | |
| tree | dbba5821b6d9b9f9bdd414248bfbfcff932b77cb /client/service_logs.go | |
| parent | 5c233cf4315747785b27d4b0f0631d220556205f (diff) | |
| download | docker-7d62e40f7e4f3c17d229a7687d6fcca5448de813.tar.gz | |
Switch from x/net/context -> context
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".
Many vendored packages still use x/net/context, so vendor entry remains
for now.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'client/service_logs.go')
| -rw-r--r-- | client/service_logs.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/service_logs.go b/client/service_logs.go index 4b393bb494..af96b1e62c 100644 --- a/client/service_logs.go +++ b/client/service_logs.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" timetypes "github.com/docker/docker/api/types/time" ) |