Anda Xu 812694c0cc fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags ...

Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 8392d0930b511402aa7aa71ccfe6c0d4a8159237)
Upstream-commit: 66ed41aec82dbcdfbc38027e3d800e429af1cd58
Component: engine

2018-09-20 10:54:47 -07:00

..

config_common_unix_test.go

Add canonical import comment

2018-02-05 16:51:57 -05:00

config_common_unix.go

Fixes for resolv.conf

2018-07-26 11:17:56 -07:00

config_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

config_unix_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

config_unix.go

Fixes for resolv.conf

2018-07-26 11:17:56 -07:00

config_windows_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

config_windows.go

Add canonical import comment

2018-02-05 16:51:57 -05:00

config.go

fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags

2018-09-20 10:54:47 -07:00

opts.go

Add canonical import comment

2018-02-05 16:51:57 -05:00