Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Oct 11, 2019

Also, remove the activation heights, as they can be retrieved from ./src/chainparams.cpp (if needed)

@fanquake fanquake added the Docs label Oct 11, 2019
@laanwj
Copy link
Member

laanwj commented Oct 12, 2019

ACK fa6ed82, needs backport to 0.19 I guess.

@maflcko maflcko added this to the 0.19.0 milestone Oct 12, 2019
laanwj added a commit that referenced this pull request Oct 15, 2019
fa6ed82 doc: update bips.md with buried BIP9 deployments (MarcoFalke)

Pull request description:

  Also, remove the activation heights, as they can be retrieved from `./src/chainparams.cpp` (if needed)

ACKs for top commit:
  laanwj:
    ACK fa6ed82, needs backport to 0.19 I guess.

Tree-SHA512: 9c069cc14589a3e2309d76f042677c024a9e14d16dbfccef54c4a2963ca7853d01f042b0237e346538c557591b7553deed9dd811ba64bbd0ced88883d562c59a
@laanwj laanwj merged commit fa6ed82 into bitcoin:master Oct 15, 2019
@maflcko maflcko deleted the 1910-docBip9Buried branch October 15, 2019 15:23
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Oct 19, 2019
@fanquake fanquake mentioned this pull request Oct 19, 2019
laanwj added a commit that referenced this pull request Oct 21, 2019
334e27e util: Filter out macOS process serial number (Hennadii Stepanov)
e1bacb5 rpc: fix -rpcclienttimeout 0 option (Fabian Jahr)
6a45766 doc: update bips.md with buried BIP9 deployments (MarcoFalke)
dc0fe7a util: Filter control characters out of log messages (Wladimir J. van der Laan)
ba46f39 init: Change fallback locale to C.UTF-8 (Wladimir J. van der Laan)

Pull request description:

  Backports the following PRs to the `0.19.0` [branch](https://github.com/bitcoin/bitcoin/tree/0.19):
  * #17184 -  util: Filter out macOS process serial number
  * #17131 - rpc: fix -rpcclienttimeout 0 option
  * #17111 - doc: update bips.md with buried BIP9 deployments
  * #17095 - util: Filter control characters out of log messages
  * #17085 - init: Change fallback locale to C.UTF-8

ACKs for top commit:
  laanwj:
    ACK  334e27e

Tree-SHA512: 436064c00f98bae8475d0e46ab104df6fc9bdae4927dcdd5cffa4242704256c749352e9cabb23cf806911b1c303ddcb0208a42d540412e98da2513176e5e1023
HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Nov 17, 2019
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
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.

3 participants