git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 991176a 5fa06a3)
Merge pull request #214 from steveeJ/merge-v0.2
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 19 May 2016 13:45:07 +0000 (15:45 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 19 May 2016 13:45:07 +0000 (15:45 +0200)
Merge v0.2


Trivial merge
CNI changes for updated IPAM