From: Michael Bridgen <mikeb@squaremobius.net>
Date: Thu, 5 May 2016 08:15:15 +0000 (+0100)
Subject: Merge pull request #197 from jainvipin/master
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=fb34e4a21dbfe74acb77f25b2fb452a436344fed;p=cni.git

Merge pull request #197 from jainvipin/master

Add Contiv to CNI supported networking
---

fb34e4a21dbfe74acb77f25b2fb452a436344fed