git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78337dc 230a555)
Merge pull request #146 from achanda/trusty
authorZach Gershman <zachgersh@users.noreply.github.com>
Tue, 15 Mar 2016 00:42:03 +0000 (17:42 -0700)
committerZach Gershman <zachgersh@users.noreply.github.com>
Tue, 15 Mar 2016 00:42:03 +0000 (17:42 -0700)
Use Ubuntu Trusty in travis

1  2 
.travis.yml patch | diff1 | diff2 | blob | history

diff --cc .travis.yml
Simple merge
CNI changes for updated IPAM