git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d497d60 2511a57)
Merge pull request #153 from steveeJ/maintainer-add-zach
authorZach Gershman <zachgersh@users.noreply.github.com>
Mon, 14 Mar 2016 22:52:21 +0000 (15:52 -0700)
committerZach Gershman <zachgersh@users.noreply.github.com>
Mon, 14 Mar 2016 22:52:21 +0000 (15:52 -0700)
MAINTAINERS: welcome Zach!


Trivial merge
CNI changes for updated IPAM