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 10, 2022
1 parent 28c1c16 commit 063a87c
Show file tree
Hide file tree
Showing 2 changed files with 3 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 v1.3.1
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f
github.com/networkservicemesh/sdk-vpp v0.0.0-20220510141339-aae58db663e9
github.com/networkservicemesh/sdk-vpp v0.0.0-20220510152312-98f1ccf62d77
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
5 changes: 2 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,12 @@ 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 v1.3.1 h1:XoegBcyXMMcl0uvq8fqk2JXTXm8c1oI7G+TBF8uuLFQ=
github.com/networkservicemesh/sdk-k8s v1.3.1/go.mod h1:DfCjcmozVgiawjBEADyFc8SKupn/Z9nlR1EKDUWY7dM=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220510140829-127617b5cd35/go.mod h1:7P9uNVVtXkhOW5nAnWBax24uadOCtmXLxMbgpm/7WrY=
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-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-20220510141339-aae58db663e9 h1:ZqjByvbhCqj2/JgQ2auX5TONDwQ5H3CtTn7CE4mZWJQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220510141339-aae58db663e9/go.mod h1:zZVpghEFLjvz37d29ACUfgspIHeC21Y4bF3LGLmyNdY=
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/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 063a87c

Please sign in to comment.