5 commits

Author	SHA1	Message	Date
Michael Crosby	5294bf7e67	Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714 ... Remove duplication of Dns in config merging.	2014-03-21 17:08:06 -07:00
LK4D4	48cb2f0317	Remove duplication of Dns in config merging. ... Fixes #4714 Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)	2014-03-19 23:20:30 +04:00
Daniel Norberg	fbfac21ed4	configurable dns search domains ... Add a --dns-search parameter and a DnsSearch configuration field for specifying dns search domains. Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)	2014-03-19 10:49:25 -04:00
Guillaume J. Charmes	ab26c16b32	Fix EXPOSE cache miss issue ... Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)	2014-03-13 13:58:09 -07:00
Solomon Hykes	6393c38339	Move the canonical run configuration objects to a sub-package ... * Config is now runconfig.Config * HostConfig is now runconfig.HostConfig * MergeConfig is now runconfig.Merge * CompareConfig is now runconfig.Compare * ParseRun is now runconfig.Parse * ContainerConfigFromJob is now runconfig.ContainerConfigFromJob * ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob This facilitates refactoring commands.go and shrinks the core. Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)	2014-02-11 20:18:46 -08:00