Vincent Demeester 0122730faf 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>

2018-04-05 10:37:35 +02:00

..

command

Merge pull request #965 from thaJeztah/fix-version-output

2018-03-28 09:53:34 +02:00

compose

Fix error with merge composefile with networks…

2018-04-05 10:37:35 +02:00

config

print a big warning about cleartext passwords

2018-03-26 16:18:32 +02:00

debug

updated vendoring

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

flags

Convert to assert.NilError

2018-03-06 15:27:34 -05:00

manifest

Convert assert.Check(t, is.Error()) to assert.Error

2018-03-06 16:00:28 -05:00

registry/client

Fixes some unit tests to be able to run them on windows

2018-03-07 18:18:13 +01:00

trust

vendor: update moby to ed7b6428

2018-03-27 14:11:29 -07:00

winresources

Add windows resources to binary.

2017-05-15 18:03:03 -04:00

cobra.go

Use HasAvailableFlags instead of HasFlags for Options in help

2018-03-22 15:24:31 +01:00

error.go

Import docker/docker/cli

2017-04-17 17:40:59 -04:00

required_test.go

Post migration fixes

2018-03-05 19:41:17 -05:00

required.go

Singularize / pluralize "argument(s)" in error message

2017-08-12 18:25:38 +02:00

version.go

Fix grammar typo in comment

2018-02-28 11:29:40 -05:00