git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7ff8ab c5f7cc8)
Merge pull request #135 from achanda/travis
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 25 Feb 2016 22:00:00 +0000 (23:00 +0100)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 25 Feb 2016 22:00:00 +0000 (23:00 +0100)
Tweak the travis file


Trivial merge
CNI changes for updated IPAM