git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b827d7 e085226)
Merge pull request #327 from dcbw/host-local-tests
authorGabe Rosenhouse <rosenhouse@users.noreply.github.com>
Mon, 14 Nov 2016 16:17:40 +0000 (08:17 -0800)
committerGitHub <noreply@github.com>
Mon, 14 Nov 2016 16:17:40 +0000 (08:17 -0800)
host-local: add DataDir IPAM conf option and use it for testcases


Trivial merge
CNI changes for updated IPAM