git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3038a5 72eddd1)
Merge pull request #156 from zachgersh/vendor
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 17 Mar 2016 09:02:30 +0000 (10:02 +0100)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 17 Mar 2016 09:02:30 +0000 (10:02 +0100)
Moves to go team vendoring solution


Trivial merge
CNI changes for updated IPAM