git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20ae9e1 76028d7)
Merge pull request #341 from dcbw/host-local-trim
authorGabe Rosenhouse <rosenhouse@users.noreply.github.com>
Fri, 16 Dec 2016 02:18:25 +0000 (18:18 -0800)
committerGitHub <noreply@github.com>
Fri, 16 Dec 2016 02:18:25 +0000 (18:18 -0800)
host-local: trim whitespace from container IDs and disk file contents


Trivial merge
CNI changes for updated IPAM