Upgrade imdario/mergo to v0.3.5

Mainly to get inline with `docker/cli` version of that dependency Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: f929f15dd6e316402394143eeb60ad9ba95a81cb Component: engine
2018-06-11 15:30:46 +02:00
parent 5dc3589aac
commit 36f219fce9
6 changed files with 315 additions and 63 deletions
@@ -436,7 +436,7 @@ func (s *DockerDaemonSuite) TestDaemonEvents(c *check.C) {
 		"(allow-nondistributable-artifacts=[",
 		" cluster-advertise=, ",
 		" cluster-store=, ",
-		" cluster-store-opts={",
+		" cluster-store-opts=",
 		" debug=true, ",
 		" default-ipc-mode=",
 		" default-runtime=",