git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 470e86e 1b9caef)
Merge pull request #400 from lstoll/lstoll-rename-build-script
authorDan Williams <dcbw@redhat.com>
Wed, 5 Apr 2017 16:03:23 +0000 (11:03 -0500)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 16:03:23 +0000 (11:03 -0500)
Rename build script to avoid conflict with bazel

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

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