Tibor Vass d1e813dc31 Merge pull request #19092 from anusha-ragunathan/builder-rm-merge ...

Remove runconfig.Merge
Upstream-commit: df9a3d100574a7f6176b8ca544dad352493686b2
Component: engine

2016-01-05 15:21:24 -05:00

..

fixtures

Move the runconfig.Parse() function into the runconfig/opts package.

2016-01-04 12:06:29 -05:00

opts

Use ImageBuildOptions in builder.

2016-01-05 10:09:34 -08:00

compare_test.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

compare.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

config_test.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

config_unix.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

config_windows.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

config.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

errors.go

Move the runconfig.Parse() function into the runconfig/opts package.

2016-01-04 12:06:29 -05:00

hostconfig_test.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

hostconfig_unix.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

hostconfig_windows.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

hostconfig.go

Move Config and HostConfig from runconfig to types/container.

2015-12-22 13:34:30 -05:00

streams.go

Extract StreamConfig struct out of the daemon package.

2015-11-20 15:04:27 -05:00