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 16, 2022
1 parent 738e2f2 commit 7813977
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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-k8s v0.0.0-20220516232434-a8a196c68e37
github.com/networkservicemesh/sdk-sriov v0.0.0-20220514222206-26102accf3df
github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514201836-b33c1916e4d4
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
9 changes: 4 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -383,16 +383,15 @@ github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/go.mod h1
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.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-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-20220514221352-3784157959aa h1:qnWfFNKnXWOJNZB3oNlqA2JGY5UTsf4YeRjpc1X/ztI=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220514221352-3784157959aa/go.mod h1:E1/WQNkn5mr18X/FelzSHXRnMlZ3Gqdg/hUMj0r/kLA=
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-kernel v0.0.0-20220516232340-6fad2237ad6d h1:EXDZQDX7D6fvEpBSXLNO/9EmuD0+Qrea8vu5NcuU8mc=
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-20220514201836-b33c1916e4d4 h1:AD9vkzGtZHQiisLRFsIZljyqJQzM6ASLR03oISBpae4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514201836-b33c1916e4d4/go.mod h1:HeihHHYcAWYoe5Wg7cZOWgZ7PrOn7LlnMCXDWJYSKW4=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
Expand Down

0 comments on commit 7813977

Please sign in to comment.