git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffff8ac d6674e0)
Merge pull request #228 from jieyu/add_mesos
authorMichael Bridgen <mikeb@squaremobius.net>
Mon, 30 May 2016 10:13:34 +0000 (11:13 +0100)
committerMichael Bridgen <mikeb@squaremobius.net>
Mon, 30 May 2016 10:13:34 +0000 (11:13 +0100)
Added Mesos to CNI users.


Trivial merge
CNI changes for updated IPAM