Conflicts: VERSION integration-cli/docker_cli_build_test.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux) Upstream-commit: 3afb89da48ee7e6e917d852416d434de9e078306 Component: engine
Conflicts: VERSION integration-cli/docker_cli_build_test.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux) Upstream-commit: 3afb89da48ee7e6e917d852416d434de9e078306 Component: engine