Merge master to develop #4723
Merged
Merge master to develop #4723
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
Feat(pox-4): return an err on improper agg-incr invocations
…ncrease-events fix: fix delegate stack increase events
update release workflow to tag the correct commit
…e to the schema we use. Don't allow more than one of them to be returned on a query, and stop storing duplicates.
…n-ops Hotfix/distinct burnchain ops
Address PR comments for changelog
fix: default 2.5 xenon affirmation overrides, allow config setting to…
…ing-release feat: add signer startup logging
…ase-image Add missing stacks-signer binary to release docker images
Feat: Consensus hash updates to tip selection
fix: .expect_result must try, regression from 2.4.0.1.0
Update CHANGELOG.md
fix: Use finite set of strings for HTTP metrics
Rearrange the methods to be in the same order, and change some parameter names to be more consistent.
Merge master into release/2.5.0.0.0
Release PR: 2.5.0.0.0
netrome
previously approved these changes
Apr 26, 2024
wileyj
previously approved these changes
Apr 26, 2024
obycode
force-pushed
the
chore/master-to-develop
branch
from
b3a0f1e
to
4e9e47f
Compare
|
I rebased again on the latest |
wileyj
approved these changes
Apr 29, 2024
netrome
approved these changes
Apr 29, 2024
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.
This was a clean merge except for one conflict in stackslib/src/chainstate/stacks/boot/pox_4_tests.rs, which was resolved by just adding both new tests.