git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c79f8b ae2f64e)
Merge pull request #165 from dcbw/go15-vendor
authorZach Gershman <zachgersh@users.noreply.github.com>
Thu, 24 Mar 2016 17:44:00 +0000 (10:44 -0700)
committerZach Gershman <zachgersh@users.noreply.github.com>
Thu, 24 Mar 2016 17:44:00 +0000 (10:44 -0700)
scripts: fix build with go-1.5 after switch to vendor/


Trivial merge
CNI changes for updated IPAM