diff options
| author | Michael Crosby <crosby.michael@gmail.com> | 2014-03-21 17:08:06 -0700 |
|---|---|---|
| committer | Michael Crosby <crosby.michael@gmail.com> | 2014-03-21 17:08:06 -0700 |
| commit | 5294bf7e67a67b2f0643c61fb126814d82a1979d (patch) | |
| tree | feefc1afea121cc4b8c5ba040bac1b82fbfc4d7b /runconfig/config_test.go | |
| parent | 97e5295f437bbb9eae26c99842b269aae1b427c2 (diff) | |
| parent | 48cb2f03177732823b4091fd3ddd44b2bef2c58e (diff) | |
| download | docker-5294bf7e67a67b2f0643c61fb126814d82a1979d.tar.gz | |
Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714
Remove duplication of Dns in config merging.
Diffstat (limited to 'runconfig/config_test.go')
| -rw-r--r-- | runconfig/config_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runconfig/config_test.go b/runconfig/config_test.go index 84846e5b1d..784341b08c 100644 --- a/runconfig/config_test.go +++ b/runconfig/config_test.go @@ -247,7 +247,7 @@ func TestMerge(t *testing.T) { volumesUser := make(map[string]struct{}) volumesUser["/test3"] = struct{}{} configUser := &Config{ - Dns: []string{"3.3.3.3"}, + Dns: []string{"2.2.2.2", "3.3.3.3"}, PortSpecs: []string{"3333:2222", "3333:3333"}, Env: []string{"VAR2=3", "VAR3=3"}, Volumes: volumesUser, |