Daniel Nephin 155efd28fa Merge build.args when merging services. ... Signed-off-by: Daniel Nephin <dnephin@docker.com>		2016-02-23 11:52:51 -08:00
..
acceptance	Include networks in the config_hash.	2016-02-03 18:21:43 +00:00
fixtures	Make 'version' a string	2016-02-03 18:21:42 +00:00
integration	Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior	2016-02-23 11:52:51 -08:00
unit	Merge build.args when merging services.	2016-02-23 11:52:51 -08:00
__init__.py	Update pre-commit config to enforace that future imports exist in all files.	2016-01-07 13:09:03 -05:00