Merge branch '1.0'

This commit is contained in:
Adam Harrison committed 2015-08-05 14:42:09 +01:00
commit 77996158ef
1 file changed
+3 -1
+3 -1
View File
@@ -481,7 +481,9 @@ attach() {
netnsenter ip route add 224.0.0.0/4 dev $CONTAINER_IFNAME
fi
arp_update $CONTAINER_IFNAME $1 "netnsenter"
for ADDR in "$@" ; do
arp_update $CONTAINER_IFNAME $ADDR "netnsenter"
done
}
detach() {