[v22.1.x] backport: 22.1 final backports #6556
Merged
Conversation
This file contains hidden or 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
aa6593a chore: bump assume valid / checkpoints for v22.1 (pasta) Pull request description: ## Issue being fixed or feature implemented Bump assume valid / checkpoint for upcoming 22.1 release ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: utACK aa6593a UdjinM6: utACK aa6593a Tree-SHA512: 99755f527b94a1be4ead3dd3a5171c6f00c77b1807e005e64a813cce9e5299c507cf47115cfd07a11f86f15f6c9e1247c3d3635bb1c9e69d4930a363499f98f8
ff785ed docs: update man pages for 22.1 (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented dashpay#6551 ## What was done? Updated man pages by new script `contrib/devtools/gen-manpages.py` see dashpay#6555 ## How Has This Been Tested? N/A ## Breaking Changes N/A ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK ff785ed; diff looks good UdjinM6: utACK ff785ed Tree-SHA512: 60a81c880e6ff824fc661dc6c6da20d85aa662fe228f7080dcb8c47db69c88adc30a40ab84832d83994ab56a26ed1de4d800dd45cd282c61233fde2d4e2212b7
f8811df docs: update supported versions in SECURITY.md (Kittywhiskers Van Gogh) Pull request description: ## Additional Information Updates the supported versions list in `SECURITY.md` ## Checklist: - [x] I have performed a self-review of my own code **(note: N/A)** - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK f8811df Tree-SHA512: 3b10dd8ea49ea63d94b9a7df0cc95f5ae0d8fe8a6e8455d09478082bb397f63025953f2786e021730a4951763295c882b9b26a61ca691fccc44072c12da52072
…ges, rewrite in Python 69b1328 Merge bitcoin#24263: doc: Fix gen-manpages, rewrite in Python (fanquake) Pull request description: ## Issue being fixed or feature implemented gen-pages.sh doesn't work correctly for `dash-cli`, it removes all hyphens somehow: ```diff .IP Set a whitelist to filter incoming RPC calls for a specific user. The field <whitelist> comes in the format: <USERNAME>:<rpc 1>,<rpc 2>,...,<rpc n>. If multiple whitelists are set for a given user, -they are set\-intersected. See \fB\-rpcwhitelistdefault\fR documentation +they are setintersected. See \fBrpcwhitelistdefault\fR documentation for information on default whitelist behavior. .HP ``` ## What was done? - backport bitcoin#24263 Rewrite the manual page generation script in Python. This: - solves '-' stripping issue (fixes bitcoin#22681) - makes that a copyright footer is generated correctly again Also change the release process to swap gen-manpages and update RC steps, so that the pages will have the correct rc and/or final version. ## How Has This Been Tested? Produced correct documents for Dash Core v22.1: dashpay#6554 ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 69b1328; looks correct UdjinM6: utACK 69b1328 kwvg: utACK 69b1328 Tree-SHA512: 01a7a9a8a4ba762e6ff36035a3fb554d998232d62da8c3441b12741e6a3b626c01c581c1ff3f6aa3dcac02e15d62eec7f2a7f94be9399895557cd0a7115424a7
UdjinM6
approved these changes
Feb 4, 2025
5 tasks
PastaPastaPasta
added a commit
that referenced
this pull request
Feb 4, 2025
774a018 chore: set release to true (pasta) Pull request description: ## Issue being fixed or feature implemented Final PR before tagging, set release to true ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 774a018 (to merge after #6556) Tree-SHA512: 09bc855dc9917ae84430df3acb1e8f36f280b65bd0c25b0a28c4c996933c560abb94d1c88c11f22db264e64119e5a6ba5e49a8e046b3b8c9ee0c1832641d402c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue being fixed or feature implemented
Backports from develop to 22.1
What was done?
How Has This Been Tested?
Breaking Changes
Checklist:
Go over all the following points, and put an
xin all the boxes that apply.