Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.1.0.0.5 to master #5797

Merged
merged 468 commits into from
Feb 4, 2025
Merged

Merge 3.1.0.0.5 to master #5797

merged 468 commits into from
Feb 4, 2025

Conversation

wileyj
Copy link
Collaborator

@wileyj wileyj commented Feb 4, 2025

Merge release 3.1.0.0.5 to master

jbencin and others added 30 commits January 17, 2025 13:08
…-collapsible-else-if

Fix collapsible_else_if clippy warnings in stackslib
…-redundant-closure

Fix clippy::redundant_closure throughout stackslib
Ensure that each block has the expected parent block in
`allow_reorg_within_first_proposal_burn_block_timing_secs`.
… into fix/clippy-ci-stacks-lib-needless-borrow
The tests don't need to run again on `push` after they've already run on
the PR and in the merge queue.
This action is no longer functional. A new automation for this can be
re-added later if needed.
…nversions

Fix clippy::useless_conversions throughout stacks core
…gration

fix: Flaky integration test `simple_neon_integration`
…re-is-ignored

Fix flakiness in forked_tenure_is_ignored
rdeioris and others added 23 commits January 31, 2025 18:09
…test retry sleep from 100ms to 500ms (less log spam in tests)
Also add one more assertion to the test.
feat: do not issue a time-based tenure extend earlier than needed
…epoch-3-disable

fix: Disable flaky test `flash_blocks_on_epoch_3`
…edundant-pattern-matching

chore: Apply Clippy lints `single_match` and `redundant_pattern_matching`
…uristic

Feat/block rejections timeout heuristic
@wileyj wileyj requested review from a team as code owners February 4, 2025 17:10
@wileyj wileyj merged commit c1a1f50 into master Feb 4, 2025
615 of 633 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants