Address comments from Misty.

Signed-off-by: Liping Xue <lipingxue@gmail.com>
docker · Jul 24, 2017 · 7761b1b · 7761b1b
1 parent c59d4fd
commit 7761b1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
@@ -445,10 +445,10 @@ func LoadVolumes(source map[string]interface{}) (map[string]types.VolumeConfig,
 				volume.External.Name = name
 				volumes[name] = volume
 			} else {
-				logrus.Warnf("volume %s: volume.external.name is deprecated, please use volume.name", name)
+				logrus.Warnf("volume %s: volume.external.name is deprecated in favor of volume.name", name)
 
 				if volume.Name != "" {
-					return nil, errors.Errorf("volume %s: volume.external.name and volume.name conflict, only use volume.name", name)
+					return nil, errors.Errorf("volume %s: volume.external.name and volume.name conflict; only use volume.name", name)
 				}
 			}
 		}

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -640,7 +640,7 @@ volumes:
 
 	assert.Error(t, err)
 	fmt.Println(err)
-	assert.Contains(t, err.Error(), "volume.external.name and volume.name conflict, only use volume.name")
+	assert.Contains(t, err.Error(), "volume.external.name and volume.name conflict; only use volume.name")
 	assert.Contains(t, err.Error(), "external_volume")
 }