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
…ersions to the latest

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
  • Loading branch information
NSMBot committed Sep 15, 2023
1 parent fd024f3 commit aabb6fe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08
github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092923-b2217adabcc2
github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092202-14a8d4d2ed08
github.com/onsi/gomega v1.20.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804 h1:RDbdW
github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804/go.mod h1:DO7D13Y4x/A8tQ2cQyUWa9o5wi7XHUB8+vITWRKreCc=
github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08 h1:Lj5T688Rb7mnPixUH+F3G6vz5SHgznjw1jtqsxRDw6Y=
github.com/networkservicemesh/sdk v0.5.1-0.20230915092224-d68a6f4ada08/go.mod h1:WrQdP/NEx+2knCVIL0X/dlAkg4y/RFvcXBhRwcz5M2Q=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092923-b2217adabcc2 h1:nFn+b/8NmLySNgo2SXXWIB1pfG21mMdc4AEB3BYiL3k=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092923-b2217adabcc2/go.mod h1:zxPvhpmLN+9/c/8a3lMnGNWDm82SZlVltsSU851Imjg=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092202-14a8d4d2ed08 h1:gNpPKv7gQQv0sA2+kjidjAKXTnCC8oRorQN7QMZ9vz8=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230915092202-14a8d4d2ed08/go.mod h1:tDty66dFjT8E98OM/NRl0oW2lJgTbqOnm+nhzM2EfuA=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
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=
Expand Down

0 comments on commit aabb6fe

Please sign in to comment.