Daniel Nephin 3ec87adccc Update merge docs with depends_on, and correction about how links and volumes_from are merged. ... Signed-off-by: Daniel Nephin <dnephin@docker.com>		2016-02-02 10:49:43 -05:00
..
acceptance	Make 'version' a string	2016-02-02 13:58:34 +00:00
fixtures	Make 'version' a string	2016-02-02 13:58:34 +00:00
integration	Make 'version' a string	2016-02-02 13:58:34 +00:00
unit	Update merge docs with depends_on, and correction about how links and volumes_from are merged.	2016-02-02 10:49:43 -05:00
__init__.py	Update pre-commit config to enforace that future imports exist in all files.	2016-01-07 13:09:03 -05:00