From 3c5db1576bf64e1d35d4294dd3e5fa643569b4c2 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 17 Oct 2024 23:50:12 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-sriov@main PR link: https://github.com/networkservicemesh/sdk-sriov/pull/620 Commit: a55e390 Author: Network Service Mesh Bot Date: 2024-10-17 18:49:21 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#620) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/692 Commit: 4f9e691 Author: Network Service Mesh Bot Date: 2024-10-17 18:45:10 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#692) PR link: https://github.com/networkservicemesh/sdk/pull/1686 Commit: 9a6b64b Author: dependabot[bot] Date: 2024-10-17 19:42:57 -0400 Message: - Bump github.com/nats-io/nkeys from 0.4.4 to 0.4.6 (#1686) Bumps [github.com/nats-io/nkeys](https://github.com/nats-io/nkeys) from 0.4.4 to 0.4.6. - [Release notes](https://github.com/nats-io/nkeys/releases) - [Changelog](https://github.com/nats-io/nkeys/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nkeys/compare/v0.4.4...v0.4.6) --- updated-dependencies: - dependency-name: github.com/nats-io/nkeys dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: NSMBot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6342f36..7117e81 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20241017171520-21c4d983a8bc - github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac + github.com/networkservicemesh/sdk v0.5.1-0.20241017234257-9a6b64bb5f81 + github.com/networkservicemesh/sdk-sriov v0.0.0-20241017234921-a55e390dca7b github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 61489d6..7b44d49 100644 --- a/go.sum +++ b/go.sum @@ -116,10 +116,10 @@ github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e h1:Fs34Z github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA= -github.com/networkservicemesh/sdk v0.5.1-0.20241017171520-21c4d983a8bc h1:Aa8e/VcRaIVyx860cfHvALMsgQe9AGJcr8bO7uNG4Lk= -github.com/networkservicemesh/sdk v0.5.1-0.20241017171520-21c4d983a8bc/go.mod h1:O0xb3CPUS1dkd7IbchN/s4esddsEVuRELUtehVVjB8Y= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac h1:P4Hu49EEIz7xL/I31mLEPmZWnRQiVui4X7Lx9D+XBfY= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac/go.mod h1:mInoT7/WRFN5nMsdow4JMOiccYgrWEuvA73k1tNUfcw= +github.com/networkservicemesh/sdk v0.5.1-0.20241017234257-9a6b64bb5f81 h1:xbBLGD9BmfvTwhy56VH8CUH45wO+jUOAvQIqXcmG250= +github.com/networkservicemesh/sdk v0.5.1-0.20241017234257-9a6b64bb5f81/go.mod h1:cE5NEKOYgdGirEvy9Q+SS/pYOFPr1C5l6lqjtFgqrYE= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241017234921-a55e390dca7b h1:GPl32gdxUOPB9P92BUek07nBDBI8EP2FDq2MMNThbPA= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241017234921-a55e390dca7b/go.mod h1:8O2oeiMY9bcwRANOkMNawxT0RQPj5kMXbqih1aZQ/5A= github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5 h1:gDqBAfOsZscLoOuKu3X4LnObr+gJmCuV8MPdZYsEgKk= github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5/go.mod h1:FXbKj/hWShsA87u8fRCSadqImTJEQ5l10vnmsCTctUU= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= From ac303b12a2e726a622be34faad2d9e3d141e2579 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 17 Oct 2024 23:53:04 +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 e791448..fbc2d45 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20241017234257-9a6b64bb5f81 - github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac + github.com/networkservicemesh/sdk-sriov v0.0.0-20241017234921-a55e390dca7b github.com/networkservicemesh/sdk-vpp v0.0.0-20241017234840-f8b5d51c3971 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 3270202..f9cf436 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA= github.com/networkservicemesh/sdk v0.5.1-0.20241017234257-9a6b64bb5f81 h1:xbBLGD9BmfvTwhy56VH8CUH45wO+jUOAvQIqXcmG250= github.com/networkservicemesh/sdk v0.5.1-0.20241017234257-9a6b64bb5f81/go.mod h1:cE5NEKOYgdGirEvy9Q+SS/pYOFPr1C5l6lqjtFgqrYE= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac h1:P4Hu49EEIz7xL/I31mLEPmZWnRQiVui4X7Lx9D+XBfY= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac/go.mod h1:mInoT7/WRFN5nMsdow4JMOiccYgrWEuvA73k1tNUfcw= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241017234921-a55e390dca7b h1:GPl32gdxUOPB9P92BUek07nBDBI8EP2FDq2MMNThbPA= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241017234921-a55e390dca7b/go.mod h1:8O2oeiMY9bcwRANOkMNawxT0RQPj5kMXbqih1aZQ/5A= github.com/networkservicemesh/sdk-vpp v0.0.0-20241017234840-f8b5d51c3971 h1:hJx+1tsLZps9PzBvnu5Neloi10l9yIWowAR+7EOpY/s= github.com/networkservicemesh/sdk-vpp v0.0.0-20241017234840-f8b5d51c3971/go.mod h1:M5yHODQ9tl1s1Sd+zGizoofzQkcznY4kUojW/HmYNmo= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=