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 4, 2022
1 parent 67aab3a commit 52054f2
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 @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab
github.com/networkservicemesh/sdk v0.5.1-0.20220704121245-6cf1b72d2395
github.com/networkservicemesh/sdk-k8s v0.0.0-20220704121926-d88dd1974c29
github.com/networkservicemesh/sdk-sriov v0.0.0-20220701101701-def85c9c0e95
github.com/networkservicemesh/sdk-sriov v0.0.0-20220704122303-ad8159884864
github.com/networkservicemesh/sdk-vpp v0.0.0-20220704122758-8bf2aa3a17ac
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ github.com/networkservicemesh/sdk-k8s v0.0.0-20220704121926-d88dd1974c29 h1:VvJM
github.com/networkservicemesh/sdk-k8s v0.0.0-20220704121926-d88dd1974c29/go.mod h1:ejEUh1eqT+4f1Ct2MhmDr/5Zdj1J6ScEF0yArFsSNzU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220704121914-75c5e0fd3acd h1:pSwK7yICjzBiSypuRQsYU2F79ZLz5JPGBKs7vG0xm3M=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220704121914-75c5e0fd3acd/go.mod h1:Z5YlGxs6GsBf92cYGtBZQKLIY28E+BJr6blTUSa2Eng=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220701101701-def85c9c0e95 h1:MKwLj57+Nv507z6s14r5MKO3Vidw79VnIh7IMGyEdkQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220701101701-def85c9c0e95/go.mod h1:O9H0K7+2lnf3YNhjJdK4vaiBj/8yiRazcruWMxp7ZwU=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220704122303-ad8159884864 h1:RybL1fIHFBdnSPBtpyQba5yeFVjzCF40RxaDx512ZsE=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220704122303-ad8159884864/go.mod h1:Nr+r1gD/lxsO/FolWcz3E/Hm+O8dhN6PIGqMcCjkkwA=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220704122758-8bf2aa3a17ac h1:MjjDG4Zqnxu3oOUQH9fpb6ns0BUNsUZOvRUcy+vSHo0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220704122758-8bf2aa3a17ac/go.mod h1:EgOYWkdlUPFbiLO8t69ETYKUS0dwzZ8+DBwLuucx6Rg=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
Expand Down

0 comments on commit 52054f2

Please sign in to comment.