From 527b21a9e14b8dc660bc833924dcf0cfef6bb0b5 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 16 May 2022 23:28:17 +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/589 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 13cfcde Author: Network Service Mesh Bot Date: 2022-05-16 18:27:48 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 702b801..48f3746 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ require ( github.com/edwarnicke/vpphelper v0.0.0-20210617172001-3e6797de32c3 github.com/golang/protobuf v1.5.2 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce - github.com/networkservicemesh/sdk v0.5.1-0.20220514221142-f0081c8f06e7 + github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab + github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b github.com/networkservicemesh/sdk-sriov v0.0.0-20220514222206-26102accf3df - github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f + github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index 5df0c8d..30fa41e 100644 --- a/go.sum +++ b/go.sum @@ -198,15 +198,18 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= -github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce h1:kpVCSUnoJoIy35F60F6DBuOWY+FZuVwYf3TlptLZP6k= github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220514221142-f0081c8f06e7 h1:ezEKgkhla3+npCY/pirF5qvzEwZASaGoXN6QERlHHLA= +github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= +github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/sdk v0.5.1-0.20220514221142-f0081c8f06e7/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s= +github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b h1:EbnWQCZGG+MFirJabvwa63634xfG+YW3afwlZ6jSq3g= +github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= github.com/networkservicemesh/sdk-kernel v0.0.0-20220514221352-3784157959aa/go.mod h1:E1/WQNkn5mr18X/FelzSHXRnMlZ3Gqdg/hUMj0r/kLA= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220516232340-6fad2237ad6d/go.mod h1:qXoFH5jKCSsoSqeV1YZ9pX0p1WFj+4CqAUqeSstqx98= github.com/networkservicemesh/sdk-sriov v0.0.0-20220514222206-26102accf3df h1:dgcVLkJfL2rHl9ETkitBIMHwMuT3IC83dU/mJsrj7nw= github.com/networkservicemesh/sdk-sriov v0.0.0-20220514222206-26102accf3df/go.mod h1:CEwugNrj71pGu4kQyKDjfs6fhb2SRE67DLNvzbgmIzo= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f h1:lKVoW4sHgmVPChgn8hRI8wMjhnyjxYWJqfzm+jKue68= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f/go.mod h1:zbwQvuHL10dfH+oJ1pyT+Wk4RAVuTyW5k1RH281n3ME= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145 h1:WFGr59Cbc+dxu6LDpQqmFNZnadK38bvjH8HnPu18pHU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145/go.mod h1:vSZF4U/PbbR25Fomp3NBQYP1RZo9z13IQ0g5QJWQ1jw= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= From 5224f5b865ad675a04f0a2a67f677f7bc2a8a25c Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 16 May 2022 23:36:40 +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 | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ec995e2..98ee306 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356 - github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f + github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index a31a7aa..e9345b8 100644 --- a/go.sum +++ b/go.sum @@ -198,18 +198,15 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= -github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220514221142-f0081c8f06e7/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s= github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b h1:EbnWQCZGG+MFirJabvwa63634xfG+YW3afwlZ6jSq3g= github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220514221352-3784157959aa/go.mod h1:E1/WQNkn5mr18X/FelzSHXRnMlZ3Gqdg/hUMj0r/kLA= github.com/networkservicemesh/sdk-kernel v0.0.0-20220516232340-6fad2237ad6d/go.mod h1:qXoFH5jKCSsoSqeV1YZ9pX0p1WFj+4CqAUqeSstqx98= github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356 h1:sKdv/KpHmVk3uOauIX9CgoJCZD1PCQXbxxJY/FGumI4= github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356/go.mod h1:by4zw8EV6H85gZUjHYpjBRpmtfivCTTx8Hyu+le9t7w= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f h1:lKVoW4sHgmVPChgn8hRI8wMjhnyjxYWJqfzm+jKue68= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f/go.mod h1:zbwQvuHL10dfH+oJ1pyT+Wk4RAVuTyW5k1RH281n3ME= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145 h1:WFGr59Cbc+dxu6LDpQqmFNZnadK38bvjH8HnPu18pHU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145/go.mod h1:vSZF4U/PbbR25Fomp3NBQYP1RZo9z13IQ0g5QJWQ1jw= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=