Merge branch '1.5' into networkv2

This commit is contained in:
Julien Duponchelle committed 2016-03-16 16:35:23 +01:00
commit dd2fdcc574
10 files changed
+85 -44

No files matched your search

+1 -1
View File
@@ -43,4 +43,4 @@ sed -n 's/^ *\(eth[0-9]*\):.*/\1/p' < /proc/net/dev | while read dev; do
done
# continue normal docker startup
/bin/sh -c "$@"
exec "$@"