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-01 14:04:53 -05:00 · 2016-02-01 14:04:53 -05:00 · 3ec87adccc
commit 3ec87adccc
parent e32863f89e
2 changed files with 11 additions and 18 deletions
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@ -2313,7 +2313,7 @@ class ExtendsTest(unittest.TestCase):
        tmpdir = py.test.ensuretemp('test_extends_with_defined_version')
        self.addCleanup(tmpdir.remove)
        tmpdir.join('docker-compose.yml').write("""
-            version: 2
+            version: "2"
            services:
              base:
                image: example