Skip to content

Merge 3.1.0.0.5 to master#5797

Merged
wileyj merged 468 commits intomasterfrom
release/3.1.0.0.5
Feb 4, 2025
Merged

Merge 3.1.0.0.5 to master#5797
wileyj merged 468 commits intomasterfrom
release/3.1.0.0.5

Conversation

@wileyj
Copy link
Copy Markdown
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`.
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
Aaron Blankstein and others added 20 commits January 31, 2025 12:30
…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
Co-authored-by: Brice <brice@hiro.so>
@wileyj wileyj requested review from a team February 4, 2025 17:10
@wileyj wileyj requested a review from a team as a code owner February 4, 2025 17:10
@wileyj wileyj requested a review from a team February 4, 2025 17:10
@wileyj wileyj merged commit c1a1f50 into master Feb 4, 2025
@blockstack-devops
Copy link
Copy Markdown
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Feb 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.