Aanand Prasad b24a60ba9f Merge pull request #1226 from aanand/merge-multi-value-options ... Merge multi-value options when extending (cherry picked from commit e708f4f59d) Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>		2015-04-01 11:00:45 -04:00
..
fixtures	Make volume host paths relative to file, merge volumes when extending	2015-03-20 15:45:16 -07:00
integration	Fix regression in Dns and DnsSearch settings	2015-03-24 16:17:05 -07:00
unit	Merge pull request #1226 from aanand/merge-multi-value-options	2015-04-01 11:00:45 -04:00
__init__.py	Fix Python 2.6	2014-01-06 17:58:49 +00:00