aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2022-12-06 16:53:54 +0100
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2022-12-06 16:54:10 +0100
commitb3f866a8dfd652b6339b79124843e58bd0bf3013 (patch)
tree2ad556b61a48e1afb76c95b967ce7dcc31d3529c
parent3afbc7d67d8e6225db73cbd298bcf738df11f03a (diff)
parenta9ea7158351ad89f62a13335368df8cc54114f7f (diff)
Merge bitcoin/bitcoin#26647: 24.0.1 final changesv24.0.1
a9ea7158351ad89f62a13335368df8cc54114f7f doc: adjust release notes for 24.0.1 (fanquake) c119b0a1766d2b3daa07c09da7947afe862f4bd1 doc: generate manual pages for 24.0.1 final (fanquake) 1b19c894a2c282177335fd61f633d4d6fd38d425 build: bump version to 24.0.1 final (fanquake) Pull request description: Changes for 24.0.1. At this stage, I don't think an rc is necessary here, and would just add another 5-x days delay to fixing these issues. This will be accompanied by a pull request to master to add a note in the 24.0.md that already exists there. Similar to what was done with 0.19.0.1. ACKs for top commit: gruve-p: ACK https://github.com/bitcoin/bitcoin/pull/26647/commits/a9ea7158351ad89f62a13335368df8cc54114f7f instagibbs: ACK https://github.com/bitcoin/bitcoin/pull/26647/commits/a9ea7158351ad89f62a13335368df8cc54114f7f hebasto: ACK a9ea7158351ad89f62a13335368df8cc54114f7f, I have reviewed the changes and they look OK. josibake: ACK https://github.com/bitcoin/bitcoin/pull/26647/commits/a9ea7158351ad89f62a13335368df8cc54114f7f w0xlt: ACK https://github.com/bitcoin/bitcoin/pull/26647/commits/a9ea7158351ad89f62a13335368df8cc54114f7f Tree-SHA512: 2e0d81ef91d947c9d55dcadcb6168fbb5251a5e613642c6250075add6a4f14f54cbb452934fa46aec035decb339e611fe721f5e9d9156e47a0341c3be26f5aa9
-rw-r--r--configure.ac2
-rw-r--r--doc/man/bitcoin-cli.16
-rw-r--r--doc/man/bitcoin-qt.16
-rw-r--r--doc/man/bitcoin-tx.16
-rw-r--r--doc/man/bitcoin-util.16
-rw-r--r--doc/man/bitcoin-wallet.16
-rw-r--r--doc/man/bitcoind.16
-rw-r--r--doc/release-notes.md11
8 files changed, 26 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 932a652ec2..87dd0dc81e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 24)
define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2022)
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index 79954b5a69..af34832fc5 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.2.
-.TH BITCOIN-CLI "1" "November 2022" "bitcoin-cli v24.0.0" "User Commands"
+.TH BITCOIN-CLI "1" "December 2022" "bitcoin-cli v24.0.1" "User Commands"
.SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v24.0.0
+bitcoin-cli \- manual page for bitcoin-cli v24.0.1
.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.0.0
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
-Bitcoin Core RPC client version v24.0.0
+Bitcoin Core RPC client version v24.0.1
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index 13c40ed82b..9bbfb9fa8c 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.2.
-.TH BITCOIN-QT "1" "November 2022" "bitcoin-qt v24.0.0" "User Commands"
+.TH BITCOIN-QT "1" "December 2022" "bitcoin-qt v24.0.1" "User Commands"
.SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v24.0.0
+bitcoin-qt \- manual page for bitcoin-qt v24.0.1
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
-Bitcoin Core version v24.0.0
+Bitcoin Core version v24.0.1
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index b68110ec0f..4b58804c07 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.2.
-.TH BITCOIN-TX "1" "November 2022" "bitcoin-tx v24.0.0" "User Commands"
+.TH BITCOIN-TX "1" "December 2022" "bitcoin-tx v24.0.1" "User Commands"
.SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v24.0.0
+bitcoin-tx \- manual page for bitcoin-tx v24.0.1
.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.0.0
.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.0.0
+Bitcoin Core bitcoin\-tx utility version v24.0.1
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 09101524e0..50f98ae3ac 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.2.
-.TH BITCOIN-UTIL "1" "November 2022" "bitcoin-util v24.0.0" "User Commands"
+.TH BITCOIN-UTIL "1" "December 2022" "bitcoin-util v24.0.1" "User Commands"
.SH NAME
-bitcoin-util \- manual page for bitcoin-util v24.0.0
+bitcoin-util \- manual page for bitcoin-util v24.0.1
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v24.0.0
+Bitcoin Core bitcoin\-util utility version v24.0.1
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index 52d8778237..212844aaf8 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.2.
-.TH BITCOIN-WALLET "1" "November 2022" "bitcoin-wallet v24.0.0" "User Commands"
+.TH BITCOIN-WALLET "1" "December 2022" "bitcoin-wallet v24.0.1" "User Commands"
.SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0
+bitcoin-wallet \- manual page for bitcoin-wallet v24.0.1
.SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v24.0.0
+Bitcoin Core bitcoin\-wallet version v24.0.1
.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 f188cdd993..1ce173d92c 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.2.
-.TH BITCOIND "1" "November 2022" "bitcoind v24.0.0" "User Commands"
+.TH BITCOIND "1" "December 2022" "bitcoind v24.0.1" "User Commands"
.SH NAME
-bitcoind \- manual page for bitcoind v24.0.0
+bitcoind \- manual page for bitcoind v24.0.1
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
.SH DESCRIPTION
-Bitcoin Core version v24.0.0
+Bitcoin Core version v24.0.1
.SH OPTIONS
.HP
\-?
diff --git a/doc/release-notes.md b/doc/release-notes.md
index a9240567d7..24920ba450 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,9 +1,12 @@
-24.0 Release Notes
-==================
+24.0.1 Release Notes
+====================
-Bitcoin Core version 24.0 is now available from:
+Due to last-minute issues (#26616), 24.0, although tagged, was never fully
+announced or released.
- <https://bitcoincore.org/bin/bitcoin-core-24.0/>
+Bitcoin Core version 24.0.1 is now available from:
+
+ <https://bitcoincore.org/bin/bitcoin-core-24.0.1/>
This release includes new features, various bug fixes and performance
improvements, as well as updated translations.