Eitan Seri-Levi 2f37bf4de5 Fix more merge conflicts between unstable and release-v7.0.0

2025-03-24 09:13:28 +11:00

..

beacon_chain

resolve merge conflicts between untstable and release-v7.0.0

2025-03-23 11:09:02 -06:00

beacon_processor

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

builder_client

Fix builder API headers (#7009)

2025-02-24 03:39:13 +00:00

client

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

eth1

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

execution_layer

decouple eth2 from store and lighthouse_network (#6680)

2025-03-14 16:44:48 +00:00

genesis

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

http_api

resolve merge conflicts between untstable and release-v7.0.0

2025-03-23 11:09:02 -06:00

http_metrics

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

lighthouse_network

update gossipsub to the latest upstream revision (#7130)

2025-03-17 00:22:19 +00:00

network

Fix more merge conflicts between unstable and release-v7.0.0

2025-03-24 09:13:28 +11:00

operation_pool

Rust 1.85 lints (#7019)

2025-02-24 02:36:13 +00:00

src

Fix more merge conflicts between unstable and release-v7.0.0

2025-03-24 09:13:28 +11:00

store

resolve merge conflicts between untstable and release-v7.0.0

2025-03-23 11:09:02 -06:00

tests

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

timer

Integrate tracing (#6339)

2025-03-12 22:31:05 +00:00

Cargo.toml

resolve merge conflicts between untstable and release-v7.0.0

2025-03-23 11:09:02 -06:00