merge queue: embarking unstable (5121d65) and [#5406 + #5397 + #4946 + #5418 + #5383 + #5174] together #5461
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
# Conflicts: # beacon_node/beacon_chain/src/events.rs # beacon_node/http_api/src/lib.rs # beacon_node/http_api/src/test_utils.rs # beacon_node/http_api/tests/main.rs # beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs # beacon_node/lighthouse_network/src/rpc/methods.rs # beacon_node/lighthouse_network/src/service/api_types.rs # beacon_node/network/src/beacon_processor/worker/rpc_methods.rs # beacon_node/tests/test.rs # common/eth2/src/types.rs # lighthouse/src/main.rs
…tBootstrap` API to return `ForkVersionedResponse`.
- log cleanup - move http_api config mutation to `config::get_config` for consistency - fix light client API responses
…ght_client_beacon_api_1
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
✨ Pull requests combination (#5406, #5397, #4946) which was ahead in the queue failed to get merged. The pull request #5174 has been re-embarked. ✨
Branch unstable (5121d65), #5406, #5397, #4946, #5418, #5383 and #5174 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #5174.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:check-success=test-suite-successcheck-success=local-testnet-successRequired conditions to stay in the queue:
#approved-reviews-by >= 1check-success=license/clacheck-success=target-branch-check