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 Jul 10, 2023
1 parent 3f1ed75 commit bb09d60
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/networkservicemesh/sdk v0.5.1-0.20230710100721-01bb35f8c3d6
github.com/networkservicemesh/sdk-k8s v0.0.0-20230710101404-d57e430dbb82
github.com/networkservicemesh/sdk-sriov v0.0.0-20230701170631-e4329a7cd2cd
github.com/networkservicemesh/sdk-vpp v0.0.0-20230704094912-338b411350d6
github.com/networkservicemesh/sdk-vpp v0.0.0-20230710101534-3259c7d5b386
github.com/pkg/errors v0.9.1
github.com/safchain/ethtool v0.3.0
github.com/sirupsen/logrus v1.9.0
Expand Down Expand Up @@ -54,7 +54,7 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230704094415-d67bccbf0625 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230710101045-a25e30ad5d4f // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230710100721-01bb35f8c3d6 h1:Pl1/e4
github.com/networkservicemesh/sdk v0.5.1-0.20230710100721-01bb35f8c3d6/go.mod h1:r9XRbQ6UlS0+hefduzFb1cX9j3W/XNOqFqUlcQk7xYM=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230710101404-d57e430dbb82 h1:Q4yYFd677mEwJfyk4K7/hFDS3hNmZEJl2dUxFUYLioE=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230710101404-d57e430dbb82/go.mod h1:/NsquabG/sO5LCxzoZSbQD38F/kyrZv2tA4VtvQ+7ik=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230704094415-d67bccbf0625 h1:ochWYH671Jf1e3BAYggwkycF+OhTbJ6SAaLGzF8dcw0=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230704094415-d67bccbf0625/go.mod h1:oo5NTzZz/ThBpLNZrO81tyFY5ncPF3GTjCniyDzc79I=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230710101045-a25e30ad5d4f h1:SLzuftpNof845xkb4aNsTKHt4rRZYwddF97x/KpYPLE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230710101045-a25e30ad5d4f/go.mod h1:nJW8dESTuRbobiZXKsv8Mzm2g9qnVSygSzxViGyCqDw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230701170631-e4329a7cd2cd h1:kDWbUPdzenoIhbgH48N+aiAbiTWVBYkANG5d4G/nZsY=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230701170631-e4329a7cd2cd/go.mod h1:0wl8WZNCLiz9NQvo8Ha7zfqaXoxcA8gsNUYm3+ONPLU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230704094912-338b411350d6 h1:w7oXh3kMmMVnw0mgYfayB3wNW2VCj0dH+uKRjL/OZm0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230704094912-338b411350d6/go.mod h1:JmUjNDBaG7WngC3dBVck5SjZsH3cC730wUXPx4eLftQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230710101534-3259c7d5b386 h1:8B4fzuJriMjqNs9KBdLnx834YvLMwv74fRI/leQ0484=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230710101534-3259c7d5b386/go.mod h1:87LRN/jddHUeQ4fQCHniz7uK3gx6rUw/VvGSTVq45oA=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down

0 comments on commit bb09d60

Please sign in to comment.