Vincent Demeester d6931c2d12 Fix error with merge composefile with networks… ...

… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 0122730faf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

2018-04-11 14:41:04 -07:00

..

agl/ed25519

Add vendor

2017-04-17 18:12:58 -04:00

Azure/go-ansiterm

Bump moby to 1ffa10ee2630917e4f2a88f5e4daf34d700eaa1f

2017-10-12 01:01:48 +02:00

containerd/continuity

Update github.com/containerd/continuity

2018-02-20 18:03:37 +01:00

coreos/etcd

Update vendoring

2017-12-26 11:45:56 +01:00

cpuguy83/go-md2man

Bump cpuguy83/go-md2man to v1.0.8

2018-02-12 12:01:20 -08:00

davecgh/go-spew

Add vendor

2017-04-17 18:12:58 -04:00

docker

Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541

2018-02-21 18:48:42 +01:00

emicklei

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

flynn-archive/go-shlex

Add vendor

2017-04-17 18:12:58 -04:00

ghodss/yaml

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

go-openapi

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

gogo/protobuf

updated vendoring

2017-09-01 19:41:06 -04:00

golang

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

google

Update gotestyourself dependency

2018-04-10 12:12:52 -07:00

googleapis/gnostic

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

gorilla

Add vendor

2017-04-17 18:12:58 -04:00

gotestyourself/gotestyourself

Replace testify vendor with updated gotestyourself

2018-04-10 13:54:23 -07:00

gregjones/httpcache

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

grpc-ecosystem/grpc-gateway

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

howeyc/gopass

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

imdario/mergo

Fix error with merge composefile with networks…

2018-04-11 14:41:04 -07:00

inconshreveable/mousetrap

Add vendor

2017-04-17 18:12:58 -04:00

json-iterator/go

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

juju/ratelimit

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

mailru/easyjson

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

mattn/go-shellwords

Add vendor

2017-04-17 18:12:58 -04:00

Microsoft/go-winio

Bump go-winio to 0.4.6

2018-01-24 02:04:09 -08:00

miekg/pkcs11

Add vendor

2017-04-17 18:12:58 -04:00

mitchellh/mapstructure

Add vendor

2017-04-17 18:12:58 -04:00

moby/buildkit

bump moby/moby and dependencies to 14ce1f1cf48e9859223c6311de58aec4dc0f046c

2017-09-29 17:44:49 +02:00

Nvveen/Gotty

Add vendor

2017-04-17 18:12:58 -04:00

opencontainers

bump runc to 6c55f98695e902427906eed2c799e566e3d3dfb5

2018-02-20 17:58:11 +01:00

peterbourgon/diskv

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

pkg/errors

Add vendor

2017-04-17 18:12:58 -04:00

pmezard/go-difflib

Add vendor

2017-04-17 18:12:58 -04:00

PuerkitoBio

Add support for kubernetes in docker cli

2017-12-26 11:22:32 +01:00

russross/blackfriday

Add missing dependencies to vendor, and fix generation imports

2017-06-02 11:12:43 -04:00

shurcooL/sanitized_anchor_name

Add missing dependencies to vendor, and fix generation imports

2017-06-02 11:12:43 -04:00

sirupsen/logrus

revendor logrus and x/crypto

2017-09-29 15:32:42 +02:00

spf13

Update spf13/cobra

2017-11-20 12:42:11 -05:00

theupdateframework/notary

Move notary to its new location

2017-10-30 17:21:41 +01:00

tonistiigi/fsutil

vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2

2017-09-30 18:26:02 +02:00

xeipuuv

Add vendor

2017-04-17 18:12:58 -04:00