Daniel Nephin 98ad5a05e4 Validate additional files before merging them. ... Consolidates all the top level config handling into `process_config_file` which is now used for both files and merge sources. Signed-off-by: Daniel Nephin <dnephin@docker.com>		2015-11-11 10:56:15 -05:00
..
acceptance	Added --force-rm to compose build.	2015-11-10 13:05:04 -05:00
fixtures	Added --force-rm to compose build.	2015-11-10 13:05:04 -05:00
integration	Update doc wording for ulimits.	2015-11-10 15:03:20 -05:00
unit	Validate additional files before merging them.	2015-11-11 10:56:15 -05:00
__init__.py	Support python 3	2015-08-25 10:37:29 -04:00