git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a58bd9 231d2d5)
Merge pull request #63 from steveeJ/no-host-local-ptp
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 24 Sep 2015 11:10:47 +0000 (13:10 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 24 Sep 2015 11:10:47 +0000 (13:10 +0200)
Merge host-local and host-local-ptp


Trivial merge
CNI changes for updated IPAM