mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
Merge bitcoin/bitcoin#25197: contrib: Remove keys that are no longer used for merging
d4b3dc5b0a726cc4cc7a8467be43126e78f841cf contrib: Remove keys that are no longer used for merging (Hennadii Stepanov) Pull request description: See: - https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-21#726591 - https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-12-09#750000 Also updated `trusted-git-root` to be right after **meshcollider**'s last merge. The latest similar change was bitcoin/bitcoin#7713. A related discussion on [IRC](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727090): > [12:28](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727090) \<MarcoFalke> jonasschnelli: I was about to ask you whether you planned to remove your fingerprint from the "trusted-keys" for merging, but it looks like this will break verify-commits ... > [12:31](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727091) \<laanwj> you would also have a add all his merge commits to exceptions, i guess > [12:32](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727092) \<laanwj> or patch the script to allow different key for different ranges of commits > [13:15](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727118) \<jonasschnelli> MarcoFalke: I had no plan to remove my keyid,… would that make sense and how would you fix verify commits? > [13:16](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727119) \<jonasschnelli> Ideally, we should set en expiration date next to those keyid ACKs for top commit: laanwj: ACK d4b3dc5b0a726cc4cc7a8467be43126e78f841cf Tree-SHA512: 6c23c932288b56b546a9ba45288205fae063e3f98ff308393acffd5d79eb5097417de1c3d8e865a3f66734740ca2388b2452c3c810e45cdf3b15ccfa215f574e
This commit is contained in:
parent
f714a57158
commit
2ce8f7716f
@ -1 +1 @@
|
||||
82bcf405f6db1d55b684a1f63a4aabad376cdad7
|
||||
577bd51a4b8de066466a445192c1c653872657e2
|
||||
|
@ -1,7 +1,5 @@
|
||||
71A3B16735405025D447E8F274810B012346C9A6
|
||||
133EAC179436F14A5CF1B794860FEB804E669320
|
||||
32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
|
||||
B8B3F1C0E58C15DB6A81D30C3648A882F4316B9B
|
||||
CA03882CB1FC067B5D3ACFE4D300116E1C875A3D
|
||||
E777299FC265DD04793070EB944D35F9AC3DB76A
|
||||
D1DBF2C4B96F2DEBF4C16654410108112E7EA81F
|
||||
|
Loading…
Reference in New Issue
Block a user