Matthias Radestock 954cd0b86a Merge branch '1.6'

2016-07-04 16:27:59 +01:00

..

cni.go

highlight the need for weave expose in CNI/k8s (#2411)

2016-07-04 16:27:11 +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