git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a06a464 4c778a6)
Merge pull request #180 from philips/add-more-intro
authorMichael Bridgen <mikeb@squaremobius.net>
Mon, 11 Apr 2016 09:12:22 +0000 (10:12 +0100)
committerMichael Bridgen <mikeb@squaremobius.net>
Mon, 11 Apr 2016 09:12:22 +0000 (10:12 +0100)
README: add some more introductory material


Trivial merge
CNI changes for updated IPAM