Skip to content
Commit 75ea001b authored by Matthew Mosesohn's avatar Matthew Mosesohn Committed by GitHub
Browse files

Merge pull request #1208 from mattymo/1.6-flannel 

Update to k8s 1.6 with flannel and centos fixes
parents acae0fe4 ff2fb919
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment