Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/opentelemetry_sdk-0.27.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sanity authored Dec 28, 2024
2 parents b56363f + 1a8d69a commit 54874e0
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 63 deletions.
117 changes: 58 additions & 59 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sqlx = { features = ["runtime-tokio-rustls", "sqlite"], optional = true, version
stretto = { features = ["async", "sync"], version = "0.8" }
tar = { version = "0.4" }
time = "0.3"
thiserror = "1"
thiserror = "2"
tokio = { features = ["fs", "macros", "rt-multi-thread", "sync", "process"], version = "1" }
tokio-tungstenite = "0.24"
tower-http = { features = ["fs", "trace"], version = "0.6" }
Expand Down Expand Up @@ -85,7 +85,7 @@ chrono = { features = ["arbitrary"], workspace = true }
freenet-stdlib = { features = ["net", "testing"], workspace = true }
pav_regression = "0.4"
pico-args = "0.5"
statrs = "0.17"
statrs = "0.18"
tempfile = "3"
tracing = "0.1"
# console-subscriber = { version = "0.4" }
Expand Down
2 changes: 1 addition & 1 deletion crates/fdev/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ serde_json = "1"
serde_with = { workspace = true }
semver = { workspace = true }
tar = "0.4"
thiserror = "1"
thiserror = "2"
tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros", "signal", "parking_lot", "process"] }
tokio-tungstenite = "0.24"
toml = { version = "0.8", features = ["default", "preserve_order"] }
Expand Down
2 changes: 1 addition & 1 deletion docs/src/architecture/p2p-network.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ location is derived from the peer's IP address.

Every Freenet peer, also referred to as a node, forms two-way connections with a
set of other peers, termed "neighbors." These connections utilize the User
Datagram Protocol (UDP) and can do [Frewall hole punching](<https://en.wikipedia.org/wiki/Hole_punching_(networking)>) when necessary. Peers manage their resource usage —
Datagram Protocol (UDP) and can do [Firewall hole punching](<https://en.wikipedia.org/wiki/Hole_punching_(networking)>) when necessary. Peers manage their resource usage —
bandwidth, memory, CPU, and storage — based on limits set by the user.

## Adaptive behavior
Expand Down

0 comments on commit 54874e0

Please sign in to comment.