From 783fed629f74e09aea30a0dd232de363eeda85b6 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Fri, 4 Oct 2024 23:14:04 +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/855 Commit: e03e1c1 Author: Network Service Mesh Bot Date: 2024-10-04 18:13:14 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#855) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/683 Commit: f5852d2 Author: Network Service Mesh Bot Date: 2024-10-04 18:09:31 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#683) PR link: https://github.com/networkservicemesh/sdk/pull/1675 Commit: 95c7ff7 Author: Arpad Kiss Date: 2024-10-05 01:07:12 +0200 Message: - Add boundary check to SetupLogLevelChange (#1675) 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 d2d9152..aa03a40 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ 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.20241001095203-5a9d3ce12c18 + github.com/networkservicemesh/sdk v0.5.1-0.20241004230712-95c7ff746298 github.com/networkservicemesh/sdk-sriov v0.0.0-20241001095800-9c3275af6b66 - github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90 + github.com/networkservicemesh/sdk-vpp v0.0.0-20241004231314-e03e1c139525 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 868766c..255a86b 100644 --- a/go.sum +++ b/go.sum @@ -116,12 +116,12 @@ 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.20241001095203-5a9d3ce12c18 h1:fm5MNQDg9YqsMOf2CmTU4qrZpe12DGD6EPMtjLIkMnI= -github.com/networkservicemesh/sdk v0.5.1-0.20241001095203-5a9d3ce12c18/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= +github.com/networkservicemesh/sdk v0.5.1-0.20241004230712-95c7ff746298 h1:HuMP8S6DLBASeV30uH6an7MWV7nfrw4YAnavRqFD9Pg= +github.com/networkservicemesh/sdk v0.5.1-0.20241004230712-95c7ff746298/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= github.com/networkservicemesh/sdk-sriov v0.0.0-20241001095800-9c3275af6b66 h1:GLYUHNu5FXcbpNGtOeDZyoTaBJiENf0eArxw6aQFj3g= github.com/networkservicemesh/sdk-sriov v0.0.0-20241001095800-9c3275af6b66/go.mod h1:fKAg+FRohrB5EGd1x8ZxREFi4qYCf56KCzKGExmaij4= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90 h1:XZEFYrsUmTOpMw36FcIChVQfIpDuxrp2EQ/jj6omMjo= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90/go.mod h1:+/l7ThlkKcShFnc3i7gBXiHutNsrFOef6i7AfI2hFuU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241004231314-e03e1c139525 h1:0oxn/6fKXILbfnRyxf9EaoHFE4yt9iR59z6eBCzDhRo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241004231314-e03e1c139525/go.mod h1:34K1JmFThpBLLTqStDFAAMOrzYi8jhcxIQrvDd0/e1E= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= From b9dc9d06af7ffc2cc81e7abd1e657f10aea910fe Mon Sep 17 00:00:00 2001 From: NSMBot Date: Fri, 4 Oct 2024 23:17:33 +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 b8ea8e8..5f4737a 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20241004230712-95c7ff746298 github.com/networkservicemesh/sdk-sriov v0.0.0-20241004231253-dc8c91bff729 - github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90 + github.com/networkservicemesh/sdk-vpp v0.0.0-20241004231314-e03e1c139525 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 84a7fa4..7177c0c 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20241004230712-95c7ff746298 h1:HuMP8S github.com/networkservicemesh/sdk v0.5.1-0.20241004230712-95c7ff746298/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= github.com/networkservicemesh/sdk-sriov v0.0.0-20241004231253-dc8c91bff729 h1:ZQvfp4jCxwj0d3Mm3hpwxEEMZ7u6s1r1E7Qwc0Pdt6Y= github.com/networkservicemesh/sdk-sriov v0.0.0-20241004231253-dc8c91bff729/go.mod h1:2nYda+/8gfisAIqjlpltzw36Q8tgoLQVGJr5WFg7y9Y= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90 h1:XZEFYrsUmTOpMw36FcIChVQfIpDuxrp2EQ/jj6omMjo= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90/go.mod h1:+/l7ThlkKcShFnc3i7gBXiHutNsrFOef6i7AfI2hFuU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241004231314-e03e1c139525 h1:0oxn/6fKXILbfnRyxf9EaoHFE4yt9iR59z6eBCzDhRo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241004231314-e03e1c139525/go.mod h1:34K1JmFThpBLLTqStDFAAMOrzYi8jhcxIQrvDd0/e1E= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=