From fd3908c98a67f3aea38baabc34d312e45cd5cf3d Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 19 Jun 2023 14:24:57 +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/718 Commit: ce2e514 Author: Artem Glazychev Date: 2023-06-19 21:24:10 +0700 Message: - Add pinggrouprange to forwarder's chain (#718) 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 ebe29210..032711c0 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20230518133110-63043b293cea github.com/networkservicemesh/sdk-k8s v0.0.0-20230518160028-d63696e0df16 github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979 - github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812 + github.com/networkservicemesh/sdk-vpp v0.0.0-20230619142410-ce2e514e2a71 github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 444c089d..4af2d9f0 100644 --- a/go.sum +++ b/go.sum @@ -245,8 +245,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230619140403-8f248dc329bc h1:x github.com/networkservicemesh/sdk-kernel v0.0.0-20230619140403-8f248dc329bc/go.mod h1:mdtPx9VkMEJaCsDXIKkhD8c5EDrkhn6C3nmv1AGU9nA= github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979 h1:hfLJkdhczvDi8ISWQAwaTtJPdVVw4OqI7ASZl3mpXog= github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979/go.mod h1:tNZAZ37GJFhwVVOaNhAwexG2l5EIrhZiIyhNeWJXXfk= -github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812 h1:7sdZqGP13HL2gX75vPYaBWVgKzYvSyFGSaDEKI+7ky4= -github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812/go.mod h1:Ftr6VMBw/nNGVed5UBfXiaTNUShhJZ1g51Nam3qlKVQ= +github.com/networkservicemesh/sdk-vpp v0.0.0-20230619142410-ce2e514e2a71 h1:UJ7zsF5M0Gx6aJmHNuXjPgVMyfkkRS+U2aHb8TWIi50= +github.com/networkservicemesh/sdk-vpp v0.0.0-20230619142410-ce2e514e2a71/go.mod h1:Ftr6VMBw/nNGVed5UBfXiaTNUShhJZ1g51Nam3qlKVQ= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8= github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= From 4abb0e5b2848ff02b37b6800994a14c5165fbb9b Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 19 Jun 2023 14:30:05 +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 032711c0..ebe29210 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20230518133110-63043b293cea github.com/networkservicemesh/sdk-k8s v0.0.0-20230518160028-d63696e0df16 github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979 - github.com/networkservicemesh/sdk-vpp v0.0.0-20230619142410-ce2e514e2a71 + github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812 github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 4af2d9f0..444c089d 100644 --- a/go.sum +++ b/go.sum @@ -245,8 +245,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230619140403-8f248dc329bc h1:x github.com/networkservicemesh/sdk-kernel v0.0.0-20230619140403-8f248dc329bc/go.mod h1:mdtPx9VkMEJaCsDXIKkhD8c5EDrkhn6C3nmv1AGU9nA= github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979 h1:hfLJkdhczvDi8ISWQAwaTtJPdVVw4OqI7ASZl3mpXog= github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979/go.mod h1:tNZAZ37GJFhwVVOaNhAwexG2l5EIrhZiIyhNeWJXXfk= -github.com/networkservicemesh/sdk-vpp v0.0.0-20230619142410-ce2e514e2a71 h1:UJ7zsF5M0Gx6aJmHNuXjPgVMyfkkRS+U2aHb8TWIi50= -github.com/networkservicemesh/sdk-vpp v0.0.0-20230619142410-ce2e514e2a71/go.mod h1:Ftr6VMBw/nNGVed5UBfXiaTNUShhJZ1g51Nam3qlKVQ= +github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812 h1:7sdZqGP13HL2gX75vPYaBWVgKzYvSyFGSaDEKI+7ky4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812/go.mod h1:Ftr6VMBw/nNGVed5UBfXiaTNUShhJZ1g51Nam3qlKVQ= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8= github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=