From c0ce50b657ae23c7f34874425473b702a1491f2d Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 27 Jun 2022 17:40:44 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/609 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 31e3bb9 Author: Network Service Mesh Bot Date: 2022-06-27 12:40:04 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index e876eecc..623de450 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab - github.com/networkservicemesh/sdk v0.5.1-0.20220616114933-1bc512535563 + github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434 github.com/networkservicemesh/sdk-k8s v0.0.0-20220616120210-be717200e822 github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd - github.com/networkservicemesh/sdk-vpp v0.0.0-20220616150103-cfac383171bb + github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 @@ -49,7 +49,7 @@ require ( github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect - github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5 // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be // indirect github.com/open-policy-agent/opa v0.16.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect diff --git a/go.sum b/go.sum index 2c878c67..75c61a20 100644 --- a/go.sum +++ b/go.sum @@ -324,16 +324,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220616114933-1bc512535563 h1:jAW5V5Fo1Bvqfh09Iin4Xp7Ahf/41gyFMWJYcwr+oQI= -github.com/networkservicemesh/sdk v0.5.1-0.20220616114933-1bc512535563/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg= +github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434 h1:kKiF8Z72jg+KZ7eJZvFPiY8OSlrwnhYHMJfA9HFtu5M= +github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg= github.com/networkservicemesh/sdk-k8s v0.0.0-20220616120210-be717200e822 h1:/41sLvhCs99MJ99slED9KrZqrLfmNStoahiou3rarIE= github.com/networkservicemesh/sdk-k8s v0.0.0-20220616120210-be717200e822/go.mod h1:znmVtnAmYSl8jPOxUNxhfFPbxGO87jo7g3e9S1xMXvQ= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5 h1:7LsDgo6RsD5Q+BHzPxvcWwOOBTGEb49De+KC2WIe9PU= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5/go.mod h1:QPWvWoxeYHSuLYttIlgk85SZiomtN+o9Wweg2Pelc5g= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be h1:cfCCnhvwbQhSih3IJm0hmJOs+iWDvNZDOu/OZV1hzWg= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be/go.mod h1:/C+tBNuU/51ka/XuvzKb3uaUJ0unTFl0q0llNvUzzP8= github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd h1:rPqW7p51fzyV8+dnCxVJNnkluIBhAPDaBkQ/t7aHpUM= github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd/go.mod h1:O9H0K7+2lnf3YNhjJdK4vaiBj/8yiRazcruWMxp7ZwU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220616150103-cfac383171bb h1:WczPKwBKEWSxxcL40n05ID+k+C6PvnXJVnbUzq4mSHU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220616150103-cfac383171bb/go.mod h1:ZuUCxhFHsFM9cE4kb1ItDQ6uUmRbUZbIkuFM6kj4lOQ= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f h1:qk9LU3ykxi52YgEWl9mWVu5u6OxyAeLUG22isc6r3wQ= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f/go.mod h1:U2YhELrRw/N7UFtyE7lW8fOHxgLTosErd08C5yCZ/bQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From a5fe95431d316d7b205bc5454fa01d2940b43e96 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 27 Jun 2022 17:47:50 +0000 Subject: [PATCH 2/2] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 2a0abf70..994ab6af 100644 --- a/go.sum +++ b/go.sum @@ -328,8 +328,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434 h1:kKiF8Z github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg= github.com/networkservicemesh/sdk-k8s v0.0.0-20220627173522-dbf063517eeb h1:+E/N/rqOLP8NtfW+dv3uzGRF//mXK8nwjlEagahs/nY= github.com/networkservicemesh/sdk-k8s v0.0.0-20220627173522-dbf063517eeb/go.mod h1:lNtdwh+4Vfoy/vOGv7lktNF/2EP6s9FrdnMqR/2OBcc= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5 h1:7LsDgo6RsD5Q+BHzPxvcWwOOBTGEb49De+KC2WIe9PU= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5/go.mod h1:QPWvWoxeYHSuLYttIlgk85SZiomtN+o9Wweg2Pelc5g= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be h1:cfCCnhvwbQhSih3IJm0hmJOs+iWDvNZDOu/OZV1hzWg= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be/go.mod h1:/C+tBNuU/51ka/XuvzKb3uaUJ0unTFl0q0llNvUzzP8= github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd h1:rPqW7p51fzyV8+dnCxVJNnkluIBhAPDaBkQ/t7aHpUM= github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd/go.mod h1:O9H0K7+2lnf3YNhjJdK4vaiBj/8yiRazcruWMxp7ZwU= github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f h1:qk9LU3ykxi52YgEWl9mWVu5u6OxyAeLUG22isc6r3wQ=