git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46e3a6b 6eac0ee)
Merge pull request #322 from cf-container-networking/flannel-cni-stateDir
authorDan Williams <dcbw@redhat.com>
Fri, 18 Nov 2016 21:27:35 +0000 (15:27 -0600)
committerGitHub <noreply@github.com>
Fri, 18 Nov 2016 21:27:35 +0000 (15:27 -0600)
Allow flannel CNI plugin stateDir to be configurable


Trivial merge
CNI changes for updated IPAM