git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75657b0 d896b82)
Merge pull request #58 from steveeJ/remove-ipmasq-ifneedbe
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 10 Sep 2015 20:08:57 +0000 (22:08 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 10 Sep 2015 20:08:57 +0000 (22:08 +0200)
ipvlan/macvlan: remove ipMasq related code


Trivial merge
CNI changes for updated IPAM