git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e0e105 77a5bf4)
Merge pull request #170 from jonboulle/master
authorMichael Bridgen <mikeb@squaremobius.net>
Thu, 31 Mar 2016 13:51:30 +0000 (14:51 +0100)
committerMichael Bridgen <mikeb@squaremobius.net>
Thu, 31 Mar 2016 13:51:30 +0000 (14:51 +0100)
README: add Calico and Weave as CNI users


Trivial merge
CNI changes for updated IPAM