Skip to content

Commit

Permalink
Automatically resolving conflicts in go.mod and updating dependency v…
Browse files Browse the repository at this point in the history
  • Loading branch information
nsmbot authored May 12, 2022
1 parent 8a0cbc1 commit 913d901
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/networkservicemesh/sdk v1.3.1
github.com/networkservicemesh/sdk-k8s v0.0.0-20220512022627-9bbb4a2c7b97
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f
github.com/networkservicemesh/sdk-vpp v0.0.0-20220510152312-98f1ccf62d77
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down
7 changes: 4 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,13 @@ github.com/networkservicemesh/sdk v1.3.1 h1:SGuhONUtEvRvNyHtYIJGnyIvW1bZ6yQHPHoT
github.com/networkservicemesh/sdk v1.3.1/go.mod h1:E7EduCLfioJBrMyucSFiTZSkZjwxAQVByb5rtcCmjWM=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220512022627-9bbb4a2c7b97 h1:I7NNF/7lu/3PRqaMq7oTiQC8oNw0IXh52+5Aby2dGsA=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220512022627-9bbb4a2c7b97/go.mod h1:K/xTiO13m+nSlSmV72XzYKQwG5SqYdzARrKt3lzC6yo=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220510150403-cc7b4d965fb6 h1:pcuP/KTlW2NJdktH0gKacMdGLEJpqfbjCD3Ai6/vAHg=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220510150403-cc7b4d965fb6/go.mod h1:7P9uNVVtXkhOW5nAnWBax24uadOCtmXLxMbgpm/7WrY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5 h1:Ntnm27hxOVePlkdtPh/Xwhy3wuyXd84LqIQU1yS+dEY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5/go.mod h1:U+mFUYf5bwyQzlJnNu5crGv9qF4M9MbCks0iKmNBJNg=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f h1:gP9pQRxm+Q7wtxxK5dLbJdFY1ALhRKHVArjkdsc2cQM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f/go.mod h1:Nah/iZKTvzKomjQalZ0p/NgCDo9eTiFSDPeQLo+lGuc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220510152312-98f1ccf62d77 h1:64ScECSa7m9YPBQRvWj+WzdV/Og+TAAH8kANNrL4OS0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220510152312-98f1ccf62d77/go.mod h1:fglaqlME6cf8b2Y5FsiQRoVODbqGJQUZH2QzW4939Kc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02 h1:Yn9DxwCF/peF+M9n+AuCELMZeESf+x6vwyttU8pWLcc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02/go.mod h1:B5XXx8QQg4IMEKHDHKT1MTpkOnAnjrbn07tfkx6Pogg=
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=
Expand Down

0 comments on commit 913d901

Please sign in to comment.