From: Michael C Cambria Date: Sat, 11 Nov 2017 15:59:36 +0000 (+0000) Subject: Merge branch 'master' of github.com:containernetworking/plugins into anycast-v1 X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=refs%2Fheads%2Fanycast-v1;p=plugins.git Merge branch 'master' of github.com:containernetworking/plugins into anycast-v1 Keeping up to date with upstream --- 68c1466391ca705c28cf22b5dbc634d22379ea9d