Anusha Ragunathan eb4ae8e28a Remove runconfig.Merge ... Merge was used by builder and daemon. With this commit, the builder call has been inlined and the function moved to the daemon package, which is the only other caller. Signed-off-by: Anusha Ragunathan <anusha@docker.com>		2016-01-05 11:28:55 -08:00
..
command	Move builder files to builder/dockerfile	2015-10-05 18:26:47 -04:00
parser	Fix typos found across repository	2015-12-13 18:04:12 +02:00
bflag.go	Fix typos found across repository	2015-12-13 18:04:12 +02:00
bflag_test.go	Move builder files to builder/dockerfile	2015-10-05 18:26:47 -04:00
builder.go	Remove package pkg/ulimit, use go-units instead.	2015-12-23 13:27:58 -05:00
dispatchers.go	Remove runconfig.Merge	2016-01-05 11:28:55 -08:00
envVarTest	Allow for env vars to have spaces in some cases	2015-11-09 12:42:56 -08:00
evaluator.go	Fix typos found across repository	2015-12-13 18:04:12 +02:00
internals.go	Move Config and HostConfig from runconfig to types/container.	2015-12-22 13:34:30 -05:00
internals_unix.go	Abstract builder and implement server-side dockerfile builder	2015-10-06 19:10:19 -04:00
internals_windows.go	Abstract builder and implement server-side dockerfile builder	2015-10-06 19:10:19 -04:00
shell_parser.go	Allow for env vars to have spaces in some cases	2015-11-09 12:42:56 -08:00
shell_parser_test.go	Allow for env vars to have spaces in some cases	2015-11-09 12:42:56 -08:00
support.go	Abstract builder and implement server-side dockerfile builder	2015-10-06 19:10:19 -04:00
wordsTest	Allow for env vars to have spaces in some cases	2015-11-09 12:42:56 -08:00