git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a15a372 bc482fe)
Merge pull request #177 from steveeJ/macvlan-arp-proxy
authorStefan Junker <steveeJ@users.noreply.github.com>
Fri, 8 Apr 2016 12:53:48 +0000 (14:53 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Fri, 8 Apr 2016 12:53:48 +0000 (14:53 +0200)
Macvlan arp proxy


Trivial merge
CNI changes for updated IPAM