Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/rootfs' into rootfs
Browse files Browse the repository at this point in the history
  • Loading branch information
sjcsjc123 committed Oct 30, 2023
2 parents c8fee3b + 5f6b493 commit b55ebef
Show file tree
Hide file tree
Showing 61 changed files with 41,873 additions and 80 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ require (
github.com/libp2p/go-tcp-transport v0.5.0 // indirect
github.com/libp2p/go-ws-transport v0.5.0 // indirect
github.com/libp2p/go-yamux/v2 v2.3.0 // indirect
github.com/libp2p/go-yamux/v3 v3.1.2 // indirect
github.com/libp2p/zeroconf/v2 v2.1.1 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/lithammer/dedent v1.1.0 // indirect
Expand Down
71 changes: 2 additions & 69 deletions go.sum

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion utils/weed/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func checkBinFile(fileName string) bool {
binName := path.Base(fileName)
switch binName {
case "weed":

case "etcd":

default:
Expand Down
202 changes: 202 additions & 0 deletions vendor/go.etcd.io/etcd/api/v3/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b55ebef

Please sign in to comment.