git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 122abae 8916a7e)
Merge pull request #158 from steveeJ/loadargs
authorZach Gershman <zachgersh@users.noreply.github.com>
Wed, 23 Mar 2016 05:05:57 +0000 (22:05 -0700)
committerZach Gershman <zachgersh@users.noreply.github.com>
Wed, 23 Mar 2016 05:05:57 +0000 (22:05 -0700)
Add generic IgnoreUnknown to valid CNI_ARGS


Trivial merge
CNI changes for updated IPAM