Merge branch 'issues/1940-remove-proxy-attach-dep'

This commit is contained in:
Bryan Boreham committed 2016-05-26 11:33:37 +00:00
commit 7c819e7f5c
1 file changed
+3
+3
View File
@@ -3,6 +3,7 @@ package net
import (
"fmt"
"net"
"time"
"github.com/j-keck/arping"
"github.com/vishvananda/netlink"
@@ -148,6 +149,8 @@ func AttachContainer(ns netns.NsHandle, id, ifName, bridgeName string, mtu int,
return err
}
for _, ipnet := range newAddresses {
// If we don't wait for a bit here, we see the arp fail to reach the bridge.
time.Sleep(1 * time.Millisecond)
arping.GratuitousArpOverIfaceByName(ipnet.IP, ifName)
}
if withMulticastRoute {