git://git.halfball.org / plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f01230d 8c5e754)
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)
flannel: set the cniVersion on the delegated config


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.