Bryan Boreham 88bf64722f Merge branch '1.6'

2016-07-12 10:33:38 +00:00

..

cni.go

Denote WithNetNS* functions with unsafe

2016-07-05 15:12:39 +01:00

driver.go

Use more chars from endpointID to reduce clashes in veth names

2016-07-01 16:05:02 +01:00

watcher.go

Perform arp configuration for plugin-connected containers

2016-06-14 17:53:34 +01:00