From 360bf2aa04e4aa715b234a7159a41736904eecad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Tue, 25 Aug 2020 10:54:19 +0200 Subject: [PATCH] rerun prepare-source after a bad merge #932 bumped the minimal Go version to 1.13. Prepare-source script had to be rerun because of some changes in vendoring. Unfortunately, while this PR was waiting to merged, #797 also touching vendoring was merged. This "commit race condition" led to a failing check on master branch because of bad vendoring. This commit reruns the prepare-source script to fix the vendoring once again. --- vendor/modules.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index ee710c9ad..9eedd214b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -131,41 +131,41 @@ github.com/stretchr/testify/assert github.com/stretchr/testify/require github.com/stretchr/testify/suite # github.com/vmware/govmomi v0.23.0 +github.com/vmware/govmomi/find github.com/vmware/govmomi/govc/cli github.com/vmware/govmomi/govc/datastore +github.com/vmware/govmomi/govc/flags +github.com/vmware/govmomi/govc/host/esxcli github.com/vmware/govmomi/govc/importx github.com/vmware/govmomi/govc/vm github.com/vmware/govmomi/govc/vm/guest -github.com/vmware/govmomi/vim25/types -github.com/vmware/govmomi/govc/flags -github.com/vmware/govmomi/object -github.com/vmware/govmomi/property -github.com/vmware/govmomi/units -github.com/vmware/govmomi/vim25/mo -github.com/vmware/govmomi/vim25/soap -github.com/vmware/govmomi/find -github.com/vmware/govmomi/nfc -github.com/vmware/govmomi/ovf -github.com/vmware/govmomi/vim25 -github.com/vmware/govmomi/vmdk -github.com/vmware/govmomi/govc/host/esxcli -github.com/vmware/govmomi/session -github.com/vmware/govmomi/task github.com/vmware/govmomi/guest github.com/vmware/govmomi/guest/toolbox -github.com/vmware/govmomi/vim25/progress +github.com/vmware/govmomi/internal +github.com/vmware/govmomi/list +github.com/vmware/govmomi/nfc +github.com/vmware/govmomi/object +github.com/vmware/govmomi/ovf +github.com/vmware/govmomi/property +github.com/vmware/govmomi/session github.com/vmware/govmomi/session/cache github.com/vmware/govmomi/session/keepalive +github.com/vmware/govmomi/task +github.com/vmware/govmomi/units +github.com/vmware/govmomi/vapi/internal github.com/vmware/govmomi/vapi/library github.com/vmware/govmomi/vapi/library/finder github.com/vmware/govmomi/vapi/rest github.com/vmware/govmomi/view +github.com/vmware/govmomi/vim25 github.com/vmware/govmomi/vim25/debug -github.com/vmware/govmomi/vim25/xml github.com/vmware/govmomi/vim25/methods -github.com/vmware/govmomi/list -github.com/vmware/govmomi/internal -github.com/vmware/govmomi/vapi/internal +github.com/vmware/govmomi/vim25/mo +github.com/vmware/govmomi/vim25/progress +github.com/vmware/govmomi/vim25/soap +github.com/vmware/govmomi/vim25/types +github.com/vmware/govmomi/vim25/xml +github.com/vmware/govmomi/vmdk # golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 golang.org/x/crypto/pkcs12 golang.org/x/crypto/pkcs12/internal/rc2