Tonis Tiigi 703c536b96 Fix integration tests build errors ...

Caused by a merge conflict.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4c7710d5d02acf42efa667fc33cb877385f2bbeb
Component: engine

2017-03-24 00:27:32 -07:00

components/engine

Fix integration tests build errors

2017-03-24 00:27:32 -07:00

Description

No description provided

310 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%