From 1e1705748cc52cf25f49914481431ac785f6defe Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 16 Oct 2023 09:42:47 +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/760 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 692750d Author: Network Service Mesh Bot Date: 2023-10-16 04:40:54 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… 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 c0044c4..b40ef56 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804 github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14 - github.com/networkservicemesh/sdk v0.5.1-0.20231005102834-7ad780b13635 + github.com/networkservicemesh/sdk v0.5.1-0.20231016093200-836a51cdce84 github.com/networkservicemesh/sdk-sriov v0.0.0-20231005104020-b74f530de173 - github.com/networkservicemesh/sdk-vpp v0.0.0-20231005103929-f4b4b9963ab3 + github.com/networkservicemesh/sdk-vpp v0.0.0-20231016094054-692750d3d8f3 github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 42e16f2..ff0b5fe 100644 --- a/go.sum +++ b/go.sum @@ -148,12 +148,12 @@ github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804 h1:RDbdW github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804/go.mod h1:DO7D13Y4x/A8tQ2cQyUWa9o5wi7XHUB8+vITWRKreCc= github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14 h1:BlBHDA3mmLDAfbzo3iR8gx2Av9TP7hhpHa7CF/q+WoU= github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14/go.mod h1:uTpdzM7rhTAJG86sjt3dQcHVABUgohuZCAyGWX5Rfmo= -github.com/networkservicemesh/sdk v0.5.1-0.20231005102834-7ad780b13635 h1:bF/V8H199xbXjnf7nQLODZNEu7m9PaCPIyDvpIfeUWQ= -github.com/networkservicemesh/sdk v0.5.1-0.20231005102834-7ad780b13635/go.mod h1:KzbOZkk84r6KMNESKb50DpIWqxqCA88Mb+2jFrAdBJs= +github.com/networkservicemesh/sdk v0.5.1-0.20231016093200-836a51cdce84 h1:UDv6QfokcJzmsN0o7HKHbNUqTyp9FnCNUkHwVrgEplA= +github.com/networkservicemesh/sdk v0.5.1-0.20231016093200-836a51cdce84/go.mod h1:KzbOZkk84r6KMNESKb50DpIWqxqCA88Mb+2jFrAdBJs= github.com/networkservicemesh/sdk-sriov v0.0.0-20231005104020-b74f530de173 h1:92lMj4TC2gFWdyY6rMw6kJMVhG4SL1e0B8M9nu3QrRM= github.com/networkservicemesh/sdk-sriov v0.0.0-20231005104020-b74f530de173/go.mod h1:fv8LyhfdYRCCvpTOIfHY+t5xS7uv/rF/Fw5uZatQcM8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231005103929-f4b4b9963ab3 h1:vA0bZHtNIT85651wA/Bl0MxFsRcKQ7KJjwdLpvzAWKU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231005103929-f4b4b9963ab3/go.mod h1:l2JjTp9YnONMm6WY9MwrBJ/Gvmp2jMdj8RG6RkDuESs= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231016094054-692750d3d8f3 h1:940DphyrvKMRv2YhtxYgl3YihQJUCqwgRo3aUAe072Y= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231016094054-692750d3d8f3/go.mod h1:ZiKUMHgTO7l42wazmYQW3QZmEA9PKejp0Cut7+IFvWU= 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 6b84998d3928af1b428bbeadce386410cb566ccf Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 16 Oct 2023 09:47:51 +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 76c07cd..8075997 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14 github.com/networkservicemesh/sdk v0.5.1-0.20231016093200-836a51cdce84 github.com/networkservicemesh/sdk-sriov v0.0.0-20231016093920-bb9af91de5eb - github.com/networkservicemesh/sdk-vpp v0.0.0-20231005103929-f4b4b9963ab3 + github.com/networkservicemesh/sdk-vpp v0.0.0-20231016094054-692750d3d8f3 github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 88b8779..ee5acac 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20231016093200-836a51cdce84 h1:UDv6Qf github.com/networkservicemesh/sdk v0.5.1-0.20231016093200-836a51cdce84/go.mod h1:KzbOZkk84r6KMNESKb50DpIWqxqCA88Mb+2jFrAdBJs= github.com/networkservicemesh/sdk-sriov v0.0.0-20231016093920-bb9af91de5eb h1:pQVmRQSvryPLTQqtj0U6fnq1L44Lf+WVjNSuh2WeTnE= github.com/networkservicemesh/sdk-sriov v0.0.0-20231016093920-bb9af91de5eb/go.mod h1:HI/QBpYSWqsy8wMs+vrVzzVkWKwWmrr9BCa8Ts3IEV8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231005103929-f4b4b9963ab3 h1:vA0bZHtNIT85651wA/Bl0MxFsRcKQ7KJjwdLpvzAWKU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231005103929-f4b4b9963ab3/go.mod h1:l2JjTp9YnONMm6WY9MwrBJ/Gvmp2jMdj8RG6RkDuESs= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231016094054-692750d3d8f3 h1:940DphyrvKMRv2YhtxYgl3YihQJUCqwgRo3aUAe072Y= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231016094054-692750d3d8f3/go.mod h1:ZiKUMHgTO7l42wazmYQW3QZmEA9PKejp0Cut7+IFvWU= 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=