git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39ea97f 5b7aa09)
Merge pull request #65 from steveeJ/fix-veth-setup
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 24 Sep 2015 19:53:54 +0000 (21:53 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 24 Sep 2015 19:53:54 +0000 (21:53 +0200)
Fix veth setup

Fixes #61 #64


Trivial merge
CNI changes for updated IPAM