Commit Graph

7 Commits

Author SHA1 Message Date
Kir Kolyshkin a6ec9e673b Bump golang.org/x/net
This version includes "x/net/context" which is fully compatible with
the standard Go "context" package, so the two can be mixed together.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-04-24 14:40:29 -07:00
Sebastiaan van Stijn a360943a48 Fix golang.org/x/sync canonical import path
The golang.org/x/sync package was vendored using the
github.com/golang/sync URL, but this is not the canonical
URL.

Because of this, vendoring failed in Moby, as it detects
these to be a duplicate import:

    vndr github.com/golang/sync
    2018/03/14 11:54:37 Collecting initial packages
    2018/03/14 11:55:00 Download dependencies
    2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-03-14 13:11:08 +01:00
Sebastiaan van Stijn 71c0bc0b89 Revendor dependencies
re-vendor using vndr a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-16 13:17:02 +01:00
Sebastiaan van Stijn f864421ead bump docker/docker to master and unfork dependencies
This patch updates all dependencies to match what is
used in moby/moby. Making the dependencies match
what is used in that repository makes sure we test
with the same version as libnetwork is later built
with in moby.

This also gets rid of some temporary forks that were
needed during the migration of Sirupsen/logrus to
sirupsen/logrus.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-25 17:26:25 +02:00
Brian Goff a143df7d99 revendor x/net and gogo/protobuf to match docker/docker
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-21 15:47:05 -04:00
Brian Goff 869e907fcf Re-run vndr with latest version
vndr has been updated and now pulls in license files and readmes.
This just re-runs with the latest version so vendoring is up to date.
Should cut down on changes from real vendor commit updates.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-21 15:42:30 -04:00
Santhosh Manohar bfd1683e74 Use vndr for managing libnetwork dependencies
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2017-01-11 17:22:05 -08:00