Aanand Prasad 276e43ca6b Fix service dict merging when only one dict has a volumes key ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>		2015-03-24 13:26:36 -07:00
..
fixtures	Make volume host paths relative to file, merge volumes when extending	2015-03-20 15:45:16 -07:00
integration	Revert "Add 'labels:' config option"	2015-03-23 15:04:04 -07:00
unit	Fix service dict merging when only one dict has a volumes key	2015-03-24 13:26:36 -07:00
__init__.py	Fix Python 2.6	2014-01-06 17:58:49 +00:00