Merge pull request #24 from squeed/flannel-return
authorDan Williams <dcbw@redhat.com>
Wed, 28 Jun 2017 13:45:02 +0000 (08:45 -0500)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2017 13:45:02 +0000 (08:45 -0500)
commit5a7a8b306923343a61fb9c9185e9442d6b22fb2e
tree6fbd813863a8d2660d554f7305857d2a47d90917
parentf01230d75f6d05dee4ca0967431aa4f5e3ea17cc
parent8c5e754617c5055c105c139517666f5502993903
Merge pull request #24 from squeed/flannel-return

flannel: set the cniVersion on the delegated config