git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b589f29 d5c56b8)
Merge pull request #105 from steveeJ/scripts
authorStefan Junker <steveeJ@users.noreply.github.com>
Fri, 29 Jan 2016 10:20:55 +0000 (11:20 +0100)
committerStefan Junker <steveeJ@users.noreply.github.com>
Fri, 29 Jan 2016 10:20:55 +0000 (11:20 +0100)
script/priv-net-run: improve shebang compatibility


Trivial merge
CNI changes for updated IPAM