Michael Crosby bedabb5a87 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix ...

Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine

2013-10-15 17:40:48 -07:00

components/engine

Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix

2013-10-15 17:40:48 -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%