Merge pull request #1333 from eyakubovich/flannel-0.5

flannel: bump to v0.5.0
This commit is contained in:
Eugene Yakubovich 2015-07-01 15:07:29 -07:00
commit 1de896c887