git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2445a96 3b5d7a3)
Merge pull request #229 from steveeJ/cleanup-travis
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 2 Jun 2016 18:43:11 +0000 (20:43 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 2 Jun 2016 18:43:11 +0000 (20:43 +0200)
travis: cleanup and bump go versions


Trivial merge
CNI changes for updated IPAM