diff options
author | fanquake <fanquake@gmail.com> | 2023-04-19 09:05:41 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-04-19 09:19:49 +0100 |
commit | 36c15d7d5cf6035bf76e54b88364373671e86337 (patch) | |
tree | 30845369dce10d3438aa54c85594685c0b3a44b2 | |
parent | 15a24781d01847d3acb77607148eae1c05cd5d4f (diff) | |
parent | 03a16a1da09f45721c799c719e48350dfe12ae88 (diff) |
Merge bitcoin/bitcoin#27486: [24.1] Bump version to 24.1rc2v24.1rc2
03a16a1da09f45721c799c719e48350dfe12ae88 doc: update release notes for 24.1rc2 (fanquake)
f344c66053f1f1c24c0dac3ecc9570bea5c7fa0a doc: update manual pages for v24.1rc2 (fanquake)
4451e899881f2ae6b46c13ff87618d45a6fa982f build: bump version to v24.1rc2 (fanquake)
Pull request description:
rc1 (tagged > a month ago) was mostly a no-op, due to lack of binaries. While some are up now, [albeit at the wrong URL](https://bitcoincore.org/bin/bitcoin-24.1rc1/), there seems no point continuing the rc1 cycle, when we already have additional changes backported (#27474), and we've also received no bug reports/feedback from anyone who did test.
So bump the version, and cut an rc2.
ACKs for top commit:
achow101:
ACK 03a16a1da09f45721c799c719e48350dfe12ae88
gruve-p:
ACK https://github.com/bitcoin/bitcoin/pull/27486/commits/03a16a1da09f45721c799c719e48350dfe12ae88
hebasto:
ACK 03a16a1da09f45721c799c719e48350dfe12ae88, I have reviewed the code and it looks OK.
Tree-SHA512: f49072149ecabb02b034b1c4d7319a80f93a8c7a29a2b7ec27dff0c257742d08d48fbf266399ce71769cec992902b7d53fc26bb5ffc8681728dc8685cbba25d9
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/man/bitcoin-cli.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-qt.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-tx.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-util.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-wallet.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoind.1 | 6 | ||||
-rw-r--r-- | doc/release-notes.md | 6 |
8 files changed, 22 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 0d27c8e998..3f948d0479 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 24) define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 1) +define(_CLIENT_VERSION_RC, 2) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2022) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 7b254103df..bd79384783 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-CLI "1" "March 2023" "bitcoin-cli v24.1.0rc1" "User Commands" +.TH BITCOIN-CLI "1" "April 2023" "bitcoin-cli v24.1.0rc2" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v24.1.0rc1 +bitcoin-cli \- manual page for bitcoin-cli v24.1.0rc2 .SH SYNOPSIS .B bitcoin-cli [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v24.1.0rc1 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v24.1.0rc1 +Bitcoin Core RPC client version v24.1.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index c36f06f6c8..f8b8069806 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-QT "1" "March 2023" "bitcoin-qt v24.1.0rc1" "User Commands" +.TH BITCOIN-QT "1" "April 2023" "bitcoin-qt v24.1.0rc2" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v24.1.0rc1 +bitcoin-qt \- manual page for bitcoin-qt v24.1.0rc2 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v24.1.0rc1 +Bitcoin Core version v24.1.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index db5f502531..595ee2d9c1 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-TX "1" "March 2023" "bitcoin-tx v24.1.0rc1" "User Commands" +.TH BITCOIN-TX "1" "April 2023" "bitcoin-tx v24.1.0rc2" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v24.1.0rc1 +bitcoin-tx \- manual page for bitcoin-tx v24.1.0rc2 .SH SYNOPSIS .B bitcoin-tx [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR @@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v24.1.0rc1 .B bitcoin-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-tx utility version v24.1.0rc1 +Bitcoin Core bitcoin\-tx utility version v24.1.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index fdc93cdbf2..abdcdee3ef 100644 --- a/doc/man/bitcoin-util.1 +++ b/doc/man/bitcoin-util.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-UTIL "1" "March 2023" "bitcoin-util v24.1.0rc1" "User Commands" +.TH BITCOIN-UTIL "1" "April 2023" "bitcoin-util v24.1.0rc2" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v24.1.0rc1 +bitcoin-util \- manual page for bitcoin-util v24.1.0rc2 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v24.1.0rc1 +Bitcoin Core bitcoin\-util utility version v24.1.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index cd6ce7f48b..b824587886 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/bitcoin-wallet.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-WALLET "1" "March 2023" "bitcoin-wallet v24.1.0rc1" "User Commands" +.TH BITCOIN-WALLET "1" "April 2023" "bitcoin-wallet v24.1.0rc2" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v24.1.0rc1 +bitcoin-wallet \- manual page for bitcoin-wallet v24.1.0rc2 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v24.1.0rc1 +Bitcoin Core bitcoin\-wallet version v24.1.0rc2 .PP bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files. By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index 975de52eb9..8bb9688585 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIND "1" "March 2023" "bitcoind v24.1.0rc1" "User Commands" +.TH BITCOIND "1" "April 2023" "bitcoind v24.1.0rc2" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v24.1.0rc1 +bitcoind \- manual page for bitcoind v24.1.0rc2 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v24.1.0rc1 +Bitcoin Core version v24.1.0rc2 .SH OPTIONS .HP \-? diff --git a/doc/release-notes.md b/doc/release-notes.md index 970e248618..fcf9788a09 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,9 @@ -24.1rc1 Release Notes +24.1rc2 Release Notes ==================== -Bitcoin Core version 24.1rc1 is now available from: +Bitcoin Core version 24.1rc2 is now available from: - <https://bitcoincore.org/bin/bitcoin-core-24.1/test.rc1/> + <https://bitcoincore.org/bin/bitcoin-core-24.1/test.rc2/> This release includes new features, various bug fixes and performance improvements, as well as updated translations. |