Merge pull request #455 from knobunc/docs/add-openshift-to-readme
authorCasey Callendrello <casey.callendrello@coreos.com>
Wed, 17 May 2017 08:52:33 +0000 (10:52 +0200)
committerGitHub <noreply@github.com>
Wed, 17 May 2017 08:52:33 +0000 (10:52 +0200)
Add OpenShift to the list of container runtimes that support CNI

1  2 
README.md

diff --cc README.md
Simple merge