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)
commitde002ff25a1709880fe55b92d19a421b47b555ec
tree303a7f3ce3a3519417e0a07d5032db1662d3e5cf
parent46e3a6b7be5061ad6c9eb879880bcac149f2a833
parent6eac0ee904417fc49e8aca749b031e9ea82b5802
Merge pull request #322 from cf-container-networking/flannel-cni-stateDir

Allow flannel CNI plugin stateDir to be configurable