From f54b72305bf05d3a1f6c28e4bdf8de9571f36da8 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 1 Oct 2024 10:00:55 +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/854 Commit: e833bac Author: Network Service Mesh Bot Date: 2024-10-01 05:00:07 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#854) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/682 Commit: 9e08c2b Author: Network Service Mesh Bot Date: 2024-10-01 04:54:32 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#682) PR link: https://github.com/networkservicemesh/sdk/pull/1672 Commit: 5a9d3ce Author: Arpad Kiss Date: 2024-10-01 11:52:03 +0200 Message: - Add log level change based on signals (#1672) 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 e6ae675..2edbc8f 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.20240927103734-b66e1bf47abb + github.com/networkservicemesh/sdk v0.5.1-0.20241001095203-5a9d3ce12c18 github.com/networkservicemesh/sdk-sriov v0.0.0-20240927104841-e12f4c8fbd18 - github.com/networkservicemesh/sdk-vpp v0.0.0-20240927104804-0702bd96c64f + github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90 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 a3ec9f6..f7a35d6 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.20240927103734-b66e1bf47abb h1:Hq9Rorudd41q1kB1jEg4l2dDhcDI84+jkB4MtID9Fuc= -github.com/networkservicemesh/sdk v0.5.1-0.20240927103734-b66e1bf47abb/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= +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-sriov v0.0.0-20240927104841-e12f4c8fbd18 h1:dTOhBSsroyhWt2MEgw6vTo5VUWoJ7458KwbLwAyiEaI= github.com/networkservicemesh/sdk-sriov v0.0.0-20240927104841-e12f4c8fbd18/go.mod h1:Th3Jh5sSMLENohyUjdy2yzct0WsCLIH20Pf0lg7m/xk= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240927104804-0702bd96c64f h1:g+nsAVF5xsJu8G1BL4PbFnh2lnTJ8MhMuSlmEsF7lhk= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240927104804-0702bd96c64f/go.mod h1:zBVY1qyDSpgZgAy3PD8zjcTxoHFiHB1kUYgTDum8+fg= +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/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 ed4d1e9a62b5dfd281d9ebe742e47bb9a7f01e5d Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 1 Oct 2024 10:04:07 +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 e89f801..d2d9152 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.20241001095203-5a9d3ce12c18 github.com/networkservicemesh/sdk-sriov v0.0.0-20241001095800-9c3275af6b66 - github.com/networkservicemesh/sdk-vpp v0.0.0-20240927104804-0702bd96c64f + github.com/networkservicemesh/sdk-vpp v0.0.0-20241001100007-e833bac64e90 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 1f5a7e7..868766c 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20241001095203-5a9d3ce12c18 h1:fm5MNQ github.com/networkservicemesh/sdk v0.5.1-0.20241001095203-5a9d3ce12c18/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-20240927104804-0702bd96c64f h1:g+nsAVF5xsJu8G1BL4PbFnh2lnTJ8MhMuSlmEsF7lhk= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240927104804-0702bd96c64f/go.mod h1:zBVY1qyDSpgZgAy3PD8zjcTxoHFiHB1kUYgTDum8+fg= +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/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=