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 17, 2022
1 parent 073915a commit a0941b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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 v0.5.1-0.20220517020800-1955d6165f5f
github.com/networkservicemesh/sdk-k8s v0.0.0-20220516232434-a8a196c68e37
github.com/networkservicemesh/sdk-sriov v0.0.0-20220517021452-65d614fd2999
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514201836-b33c1916e4d4
github.com/networkservicemesh/sdk-vpp v0.0.0-20220517021517-36151da64345
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: 2 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -379,22 +379,19 @@ 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.20220514195906-4ea3f90ef51e/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s=
github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A=
github.com/networkservicemesh/sdk v0.5.1-0.20220517020800-1955d6165f5f h1:YOs69OpxcbKZ08tPmXTgSwtNUs8wCWuVDocvGxNIT7I=
github.com/networkservicemesh/sdk v0.5.1-0.20220517020800-1955d6165f5f/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220516232434-a8a196c68e37 h1:/uqLK0cjdpr2ZVfbTpRTqtP7kC9Gis9/5r5SN7mBViQ=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220516232434-a8a196c68e37/go.mod h1:11QFC2C7hZhUQaqRvdi5RNaVoe1X5DjcXo8z1YgB5pw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220514201519-2b7a3d22ee80/go.mod h1:COtoHC9b4npq8qObS5MH7sxohCYn3AXXLEeYhicAhzA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220517021108-8a05a87f1545 h1:KhTxBqNzQP04skjYR4DEN4ngHRXGlTKZnYNlto70Eys=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220517021108-8a05a87f1545/go.mod h1:XWr+GRikueZo3rMO4wuQ10W3PPJEonm0zVa2XR9iQ4c=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220517021452-65d614fd2999 h1:LKAEEju3ILYwFC7TfPk/q1AjvX0n2fOtymU7DPk04Uc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220517021452-65d614fd2999/go.mod h1:CkvB3yoVlF4MKv1V7gMukNpJWxwSoGNpWs4E/bDz/Qk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514201836-b33c1916e4d4 h1:AD9vkzGtZHQiisLRFsIZljyqJQzM6ASLR03oISBpae4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514201836-b33c1916e4d4/go.mod h1:HeihHHYcAWYoe5Wg7cZOWgZ7PrOn7LlnMCXDWJYSKW4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220517021517-36151da64345 h1:zRCJcVO+0ZXILxTlz5dSggeqHApDmPaTFH7SPOBvqX8=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220517021517-36151da64345/go.mod h1:qdWMsfbEPvvbNsaOxZt/GGZmlYfKilpJHXawxfOZXHM=
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 a0941b9

Please sign in to comment.