Merge pull request #1557 from aboch/to

Set a timeout to the netlink handle sockets
moby · Nov 18, 2016 · 0d220ff · 0d220ff
2 parents 2edda38 + f459afb
commit 0d220ff
Show file tree

Hide file tree

Showing 16 changed files with 421 additions and 33 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/bpf_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/bpf_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/handle_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/handle_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go