git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5e39a8 95a9ea0)
Merge pull request #294 from dcbw/host-local-ranges
authorGabe Rosenhouse <rosenhouse@users.noreply.github.com>
Tue, 6 Sep 2016 03:24:42 +0000 (23:24 -0400)
committerGitHub <noreply@github.com>
Tue, 6 Sep 2016 03:24:42 +0000 (23:24 -0400)
Fix handling of host-local IP address ranges


Trivial merge
CNI changes for updated IPAM