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 Apr 15, 2022
1 parent a27dc45 commit 3b8f164
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 @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5
github.com/networkservicemesh/sdk v0.5.1-0.20220415125440-009c3f3a16bd
github.com/networkservicemesh/sdk-k8s v0.0.0-20220408132531-c168f38387a0
github.com/networkservicemesh/sdk-sriov v0.0.0-20220408125444-7f4929ac39a1
github.com/networkservicemesh/sdk-sriov v0.0.0-20220415130216-9efc2a84b057
github.com/networkservicemesh/sdk-vpp v0.0.0-20220415130110-056064de5948
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
5 changes: 2 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220415125440-009c3f3a16bd h1:8fDTCw
github.com/networkservicemesh/sdk v0.5.1-0.20220415125440-009c3f3a16bd/go.mod h1:QHDp+cawYWaL8UKppdZT9a6hn/1Oi9pUQTBOTjQPeG0=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220408132531-c168f38387a0 h1:lGc7LltIGe79E6hKoa+qiA1YB5sTqDLU409VlmMJdhk=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220408132531-c168f38387a0/go.mod h1:Vst8CazaNITZnaLLD61GMt33aITeDDXhv58TD+9keXE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220408124342-c6a45e684ec8/go.mod h1:/5H2UQB/jwdAReqWaaGdgVpOVYYhkpBz/Oy8+AT7eoE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220415125717-fb284fbe9fc1 h1:63oqIkomS03rkKuGzcLVi4Nm+3NkAIeZezoknSdKVVk=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220415125717-fb284fbe9fc1/go.mod h1:6XoT4ybgoirLN+m+O0QPpSFQqoY1cEAXiZf5hjWpJT4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220408125444-7f4929ac39a1 h1:FFHcOlfws+2MkzPYb9f/4XvTrisGy7VL1EIcOCmriJc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220408125444-7f4929ac39a1/go.mod h1:qedZ1GGoj5Toz564YyaktWXtoOlHrACApGTby8xagS4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220415130216-9efc2a84b057 h1:+RjYfb3dGW0uLa12OjZy8So1lwjA3Xmz6vHQI7p7+Xw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220415130216-9efc2a84b057/go.mod h1:rIQ+4nyQP0aMiSY/JE9odB2tXIF4J2Vz9hd6TnW/UUI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220415130110-056064de5948 h1:fFxg4J89QEcZtUZnvCSH+u4VtpMC3mdChlsz0tDaDTo=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220415130110-056064de5948/go.mod h1:1mDDQPyDZbSXEWz8er5ObWFp9AAcgfXfGzl9XJRQbB8=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
Expand Down

0 comments on commit 3b8f164

Please sign in to comment.