From: Dan Williams <dcbw@redhat.com>
Date: Wed, 28 Jun 2017 13:45:02 +0000 (-0500)
Subject: Merge pull request #24 from squeed/flannel-return
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=5a7a8b306923343a61fb9c9185e9442d6b22fb2e;p=plugins.git

Merge pull request #24 from squeed/flannel-return

flannel: set the cniVersion on the delegated config
---

5a7a8b306923343a61fb9c9185e9442d6b22fb2e