Merge remote-tracking branch 'origin/rootfs' into rootfs

sealerio · Oct 30, 2023 · b55ebef · b55ebef
2 parents c8fee3b + 5f6b493
commit b55ebef
Show file tree

Hide file tree

Showing 61 changed files with 41,873 additions and 80 deletions.
diff --git a/go.mod b/go.mod
@@ -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

diff --git a/go.sum b/go.sum
diff --git a/utils/weed/check.go b/utils/weed/check.go
@@ -42,7 +42,6 @@ func checkBinFile(fileName string) bool {
  binName := path.Base(fileName)
  switch binName {
  case "weed":
-
  case "etcd":
 
  default:

diff --git a/vendor/go.etcd.io/etcd/api/v3/LICENSE b/vendor/go.etcd.io/etcd/api/v3/LICENSE