From 0e6a808b79582b602633a806e4066dcea9e8456a Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 25 Dec 2023 11:08:03 +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/785 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 5148f53 Author: Network Service Mesh Bot Date: 2023-12-25 05:07:09 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d3fb92e..cd1d8af 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20231216233431-9c82b2963820 github.com/networkservicemesh/sdk v1.11.2 github.com/networkservicemesh/sdk-sriov v0.0.0-20231221130036-1095e1851fd2 - github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6 + github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557 github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 3361e80..d7dceba 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/networkservicemesh/sdk v1.11.2 h1:HHhA6vjbyVEDffcx2vUuc1/kHqBuTmTJrxb github.com/networkservicemesh/sdk v1.11.2/go.mod h1:9B6CU54HGgkBQ8d1rQH18HzAMr7kGWNMoYdVARYAkGQ= github.com/networkservicemesh/sdk-sriov v0.0.0-20231221130036-1095e1851fd2 h1:jSbOwENtDN3osdQBtaTJSVToxwiG2NeXUYHmrO1o1OU= github.com/networkservicemesh/sdk-sriov v0.0.0-20231221130036-1095e1851fd2/go.mod h1:49QPLHoJn9E6zVWuplZ1lR1qtDvxgYudmDt0HsCvsOI= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6 h1:3lF7ZXt+rGhOoIg1CAADzNAIMB9Jkemn3TGcAIOXOJU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6/go.mod h1:I7K+3kdvLX4La0L0OxQ9KSEP9AgM9KjJCcygwNR3YwM= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557 h1:I6aY62DEa3HnYYcXJPorT15BZYWreJp8PbyqyYFC4H8= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557/go.mod h1:yVqWTGQR0Q6SQS5KFUV7q1rSw5fTeBkFM9yI4471PLI= github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw= github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb/go.mod h1:gHuTaUs1uFvyOY0Cy9DXvyAR2MtwmlPD2NTyYfr6kLc= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From de4ec765877cc1b2ec2b5d6952455ad040fa8eb9 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 25 Dec 2023 11:11:06 +0000 Subject: [PATCH 2/2] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a88a0c7..3f521f0 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20231216233431-9c82b2963820 github.com/networkservicemesh/sdk v1.11.2 github.com/networkservicemesh/sdk-sriov v0.0.0-20231225110656-ac9cb42fc03f - github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6 + github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557 github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 955b653..0b4960f 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/networkservicemesh/sdk v1.11.2 h1:HHhA6vjbyVEDffcx2vUuc1/kHqBuTmTJrxb github.com/networkservicemesh/sdk v1.11.2/go.mod h1:9B6CU54HGgkBQ8d1rQH18HzAMr7kGWNMoYdVARYAkGQ= github.com/networkservicemesh/sdk-sriov v0.0.0-20231225110656-ac9cb42fc03f h1:t9SRnuWcXmY6kiz1huCOlYoCOLTFUxKZRYuMfIrP0PQ= github.com/networkservicemesh/sdk-sriov v0.0.0-20231225110656-ac9cb42fc03f/go.mod h1:xRo3c0JqzwDKNtkRQJ4XWbcUjArEvUAoy03BgfC+jBc= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6 h1:3lF7ZXt+rGhOoIg1CAADzNAIMB9Jkemn3TGcAIOXOJU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231221130128-09fbd443c0a6/go.mod h1:I7K+3kdvLX4La0L0OxQ9KSEP9AgM9KjJCcygwNR3YwM= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557 h1:I6aY62DEa3HnYYcXJPorT15BZYWreJp8PbyqyYFC4H8= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231225110709-5148f539e557/go.mod h1:yVqWTGQR0Q6SQS5KFUV7q1rSw5fTeBkFM9yI4471PLI= github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw= github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb/go.mod h1:gHuTaUs1uFvyOY0Cy9DXvyAR2MtwmlPD2NTyYfr6kLc= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=