github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-10-21 23:48:25 +00:00
Code Issues Projects Releases Wiki Activity
Files
ae42a3a1078a26722b15d68f81d65a8d9c01eb16
multus-cni/vendor
History
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
..
github.com
Update k8s npwg repo name due to its change
2019-10-29 09:06:27 -04:00
golang.org/x
Merge branch 'ocp-43-features' into ocp-43-features-resolved
2019-10-29 15:11:35 -04:00
google.golang.org
Fixes K8sNetworkPlumbingWG package capitalization
2019-10-21 10:42:49 -04:00
gopkg.in
Fixes K8sNetworkPlumbingWG package capitalization
2019-10-21 10:42:49 -04:00
k8s.io
Fixes K8sNetworkPlumbingWG package capitalization
2019-10-21 10:42:49 -04:00
sigs.k8s.io/yaml
Fixes K8sNetworkPlumbingWG package capitalization
2019-10-21 10:42:49 -04:00
modules.txt
Update k8s npwg repo name due to its change
2019-10-29 09:06:27 -04:00