git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 463e171 bf8bde8)
Merge pull request #201 from jonboulle/master
authorMichael Bridgen <mikeb@squaremobius.net>
Thu, 12 May 2016 13:51:37 +0000 (14:51 +0100)
committerMichael Bridgen <mikeb@squaremobius.net>
Thu, 12 May 2016 13:51:37 +0000 (14:51 +0100)
MAINTAINERS: add Tom Denham and Gabe Rosenhouse


Trivial merge
CNI changes for updated IPAM