git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbcecbc 914a85c)
Merge pull request #197 from jainvipin/master
authorMichael Bridgen <mikeb@squaremobius.net>
Thu, 5 May 2016 08:15:15 +0000 (09:15 +0100)
committerMichael Bridgen <mikeb@squaremobius.net>
Thu, 5 May 2016 08:15:15 +0000 (09:15 +0100)
Add Contiv to CNI supported networking


Trivial merge
CNI changes for updated IPAM