Merge branch 'v1.1' into marathon-lb

This commit is contained in:
Guilhem Lettron 2016-10-12 15:51:41 +02:00 committed by GitHub
commit bd5009058b
2 changed files with 3 additions and 2 deletions

View file

@ -615,7 +615,8 @@ func listServices(ctx context.Context, dockerClient client.APIClient) ([]dockerD
return []dockerData{}, err
}
for _, network := range networkList {
networkMap[network.ID] = &network
networkToAdd := network
networkMap[network.ID] = &networkToAdd
}
var dockerDataList []dockerData