diff options
| author | fanquake <fanquake@gmail.com> | 2020-07-10 12:28:07 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-07-10 12:45:47 +0800 |
| commit | 01c563708f329df0f4ee7762ec98860265225da2 (patch) | |
| tree | 10ee4ea03b0960eab263bcfcf9cfb8253264194c /configure.ac | |
| parent | cd32134bda3e4bf04e58dd7555ef8b9d4bf1175b (diff) | |
| parent | 2b79ac740622218a52e2cf3ae1755dd3a8d4847a (diff) | |
Merge #19224: [0.20] Backports
2b79ac740622218a52e2cf3ae1755dd3a8d4847a Clean up separated ban/discourage interface (Pieter Wuille)
04773480575ac79f238ac5764247dddd0cae5051 Replace automatic bans with discouragement filter (Pieter Wuille)
e7f06f9b0e84a65812d24ff6efa4bc2d3d818590 test: remove Cirrus CI FreeBSD job (fanquake)
eb6b82a5586a0cea5b72c376ff377a7322acb588 qa: Test concurrent wallet loading (João Barbosa)
c9b49d28563487e76169c7749b309244cabc70bd wallet: Handle concurrent wallet loading (João Barbosa)
cf0b5a933da540416b530ca6eb0259ab18cc6548 tests: Check that segwit inputs in psbt have both UTXO types (Andrew Chow)
3228b59b1761a80bca6aa7309cb46db5acafc905 psbt: always put a non_witness_utxo and don't remove it (Andrew Chow)
ed5ec3080419445c0af7410c0af7a421704841a6 psbt: Allow both non_witness_utxo and witness_utxo (Andrew Chow)
68e0e6f85247c8b9e0b0f039bc31c434632c2982 rpc: show both UTXOs in decodepsbt (Andrew Chow)
27786d072dbcf65cba9110f1dd171f94b6abc107 trivial: Suggested cleanups to surrounding code (Russell Yanofsky)
654420d6dfb455ca4030055881db4e3aa9ec6e8b wallet: Minimal fix to restore conflicted transaction notifications (Russell Yanofsky)
febebc4ea68104bba9ad2cf4468fc50e6136f803 Fix WSL file locking by using flock instead of fcntl (Samuel Dobson)
5c7151a60468bf3c603ffe0490fbbe95736fdd69 gui: update Qt base translations for macOS release (fanquake)
c219d21634b3eff537471c4d52e631679965d8d8 build: improved output of configure for build OS (sachinkm77)
0596a6eeb5ddb84c7095aed71bb7e6645c275f07 util: Don't reference errno when pthread fails. (MIZUTA Takeshi)
Pull request description:
Currently backports the following to the 0.20 branch:
* #18700 - Fix locking on WSL using flock instead of fcntl
* #18982 - wallet: Minimal fix to restore conflicted transaction notifications
* #19059 - gui: update Qt base translations for macOS release
* #19152 - build: improve build OS configure output
* #19194 - util: Don't reference errno when pthread fails.
* #19215 - psbt: Include and allow both non_witness_utxo and witness_utxo for segwit inputs
* #19219 - Replace automatic bans with discouragement filter
* #19300 - wallet: Handle concurrent wallet loading
ACKs for top commit:
amitiuttarwar:
ACK 04773480575ac79f238ac5764247dddd0cae5051 2b79ac740622218a52e2cf3ae1755dd3a8d4847a by comparing to original changes, double checking the diff
sipa:
utACK 2b79ac740622218a52e2cf3ae1755dd3a8d4847a
laanwj:
ACK 2b79ac740622218a52e2cf3ae1755dd3a8d4847a
Tree-SHA512: e5eb31d08288fa4a6e8aba08e60b16ce1988f14f249238b1cfd18ab2c8f6fcd9f07e3c0c491d32d2361fca26e3037fb0374f37464bddcabecea29069d6737539
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c48a9a02a9..e61b65f7fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1668,7 +1668,7 @@ echo " gprof enabled = $enable_gprof" echo " werror = $enable_werror" echo echo " target os = $TARGET_OS" -echo " build os = $BUILD_OS" +echo " build os = $build_os" echo echo " CC = $CC" echo " CFLAGS = $CFLAGS" |