dougbtv 83987a0d73 Merge branch 'ocp-43-features' into ocp-43-features-resolved ...

Resolves conflicts for a large number of files (particularly vendored) as this is an overdue update to Multus v3.3

Primarily this resolution takes --theirs, but build in particular was manually massaged.

2019-10-29 15:11:35 -04:00

..

unix

Merge branch 'ocp-43-features' into ocp-43-features-resolved

2019-10-29 15:11:35 -04:00

windows

Fixes K8sNetworkPlumbingWG package capitalization

2019-10-21 10:42:49 -04:00

AUTHORS

[deps] Update grpc for CVE-2019-9511 https://nvd.nist.gov/vuln/detail/CVE-2019-9511

2019-08-30 17:17:42 -04:00

CONTRIBUTORS

[deps] Update grpc for CVE-2019-9511 https://nvd.nist.gov/vuln/detail/CVE-2019-9511

2019-08-30 17:17:42 -04:00

LICENSE

[deps] Update grpc for CVE-2019-9511 https://nvd.nist.gov/vuln/detail/CVE-2019-9511

2019-08-30 17:17:42 -04:00

PATENTS

[deps] Update grpc for CVE-2019-9511 https://nvd.nist.gov/vuln/detail/CVE-2019-9511

2019-08-30 17:17:42 -04:00