From 9d7dc84ba1b0f5c2c38ca2c411f00c58f5d0f10e Mon Sep 17 00:00:00 2001 From: NSMBot Date: Fri, 13 May 2022 01:46:46 +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/582 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: c24053e Author: Network Service Mesh Bot Date: 2022-05-12 20:46:17 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 92f4c5c4..7e9ada7a 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,11 @@ require ( github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 - github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 + github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b + github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 github.com/networkservicemesh/sdk-k8s v0.0.0-20220512222121-cb9e385a3be1 github.com/networkservicemesh/sdk-sriov v0.0.0-20220512161739-47b112394e9a - github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1 + github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2 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 ca083ffa..9b49997e 100644 --- a/go.sum +++ b/go.sum @@ -379,18 +379,21 @@ 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.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI= github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI= +github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b h1:suJRTlWU7/N0gF3FdcN9kCf1MO5Z7CdVSBdb2JTkLhk= +github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= +github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 h1:J69KOXLObKnmtGaR7/uEw3PII/HqNkLwFQwdZffDdyE= +github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894/go.mod h1:7Aa9sCLOVzhsbR7LBJ1nSK/YCzd/EO/YK3BbHPB0puw= github.com/networkservicemesh/sdk-k8s v0.0.0-20220512222121-cb9e385a3be1 h1:GUBYUzBHngu1WVxVo0CFnfpsUuaNUzfWT6pncMDy0X8= github.com/networkservicemesh/sdk-k8s v0.0.0-20220512222121-cb9e385a3be1/go.mod h1:EpSNe/+U2xHVti2sQzlHs3JN004Tas/dok/1Mh9+uYc= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220512161349-4d24356e42ea h1:q+YVlJSooEzo8vcRwyfC2+LOeCy5N+zuvlxBm5s5hDQ= github.com/networkservicemesh/sdk-kernel v0.0.0-20220512161349-4d24356e42ea/go.mod h1:JVh8X7fHtyIyP8qU8m2tLPUybbA4bTkLwHSK7hNWnDE= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220513014027-1a5c14d724b1 h1:j2x0mA93OxfDoj2yyFXNiZkUcBZ8Ou7LXHEnuwi2Twc= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220513014027-1a5c14d724b1/go.mod h1:qcsOKUNPmQ1H22NHpOFuzU8ToM4NZZrYt2WmDLmd6OU= github.com/networkservicemesh/sdk-sriov v0.0.0-20220512161739-47b112394e9a h1:S+99GwwyzwtEiyVJpyiD+G04iz4rxgGLthFIu4HBCyw= github.com/networkservicemesh/sdk-sriov v0.0.0-20220512161739-47b112394e9a/go.mod h1:PAyEseS6IpWjWtsh8IZfZnNgWJjNWJTpelFTGNhsxrY= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1 h1:34xnI7f5eFlOitHs7bVhvbHkbuh79mJyW0fsP9VpBv4= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1/go.mod h1:LK3oW8F+VYeNPCX7yyPZY/dnVqkjveH6ZemRlSkapXk= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2 h1:txVIwzQYpO0FdisNA7rR9K+ldHNnUNuGQJoJ2owiRC4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2/go.mod h1:QP6BZvV9M9nr1GHnxyoJJMPysuwqG23DzhgZs1fmdfw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= From 210a0cc16e5f844a532b86ebe1b386cfc19c61b6 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Fri, 13 May 2022 01:53:08 +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 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e7dd381e..3e707a8c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 github.com/networkservicemesh/sdk-k8s v0.0.0-20220512222121-cb9e385a3be1 github.com/networkservicemesh/sdk-sriov v0.0.0-20220513014423-ade0247aaaf7 - github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1 + github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2 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 c8eed171..4e562f26 100644 --- a/go.sum +++ b/go.sum @@ -387,13 +387,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 h1:J69KOX github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894/go.mod h1:7Aa9sCLOVzhsbR7LBJ1nSK/YCzd/EO/YK3BbHPB0puw= github.com/networkservicemesh/sdk-k8s v0.0.0-20220512222121-cb9e385a3be1 h1:GUBYUzBHngu1WVxVo0CFnfpsUuaNUzfWT6pncMDy0X8= github.com/networkservicemesh/sdk-k8s v0.0.0-20220512222121-cb9e385a3be1/go.mod h1:EpSNe/+U2xHVti2sQzlHs3JN004Tas/dok/1Mh9+uYc= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220512161349-4d24356e42ea/go.mod h1:JVh8X7fHtyIyP8qU8m2tLPUybbA4bTkLwHSK7hNWnDE= github.com/networkservicemesh/sdk-kernel v0.0.0-20220513014027-1a5c14d724b1 h1:j2x0mA93OxfDoj2yyFXNiZkUcBZ8Ou7LXHEnuwi2Twc= github.com/networkservicemesh/sdk-kernel v0.0.0-20220513014027-1a5c14d724b1/go.mod h1:qcsOKUNPmQ1H22NHpOFuzU8ToM4NZZrYt2WmDLmd6OU= github.com/networkservicemesh/sdk-sriov v0.0.0-20220513014423-ade0247aaaf7 h1:Elfb1nyJP0zaSnnXKQpvc1e9NWRV0ZzS83/WQ5YZaSk= github.com/networkservicemesh/sdk-sriov v0.0.0-20220513014423-ade0247aaaf7/go.mod h1:GZExFojIu2iap+cqAetFFhKrDKIZFzSfzVgYdmGgpZM= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1 h1:34xnI7f5eFlOitHs7bVhvbHkbuh79mJyW0fsP9VpBv4= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1/go.mod h1:LK3oW8F+VYeNPCX7yyPZY/dnVqkjveH6ZemRlSkapXk= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2 h1:txVIwzQYpO0FdisNA7rR9K+ldHNnUNuGQJoJ2owiRC4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2/go.mod h1:QP6BZvV9M9nr1GHnxyoJJMPysuwqG23DzhgZs1fmdfw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=