Vincent Demeester 96e7de35a2 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>
Upstream-commit: 0122730faf
Component: cli

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

..

convert

Fix named network in compose file

2018-03-12 15:15:27 -04:00

interpolation

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

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

loader

Fix error with merge composefile with networks…

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

schema

Convert assert.Check with

2018-03-06 15:43:53 -05:00

template

Convert to assert.NilError

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

types

Simplify the marshaling of compose types.Config

2018-02-21 18:47:10 +01:00