Tom Trevethan
|
8229658530
|
Merge bf3b589413 into merged_master (Bitcoin PR bitcoin/bitcoin#26791)
|
2025-04-01 10:27:34 +00:00 |
|
Byron Hambly
|
2210416134
|
Merge f301bf52ab into merged_master (Bitcoin PR bitcoin/bitcoin#26257)
|
2025-04-01 08:27:16 +02:00 |
|
Byron Hambly
|
373f453213
|
Merge 65de8eeeca into merged_master (Bitcoin PR bitcoin/bitcoin#26770)
|
2025-03-31 17:22:51 +02:00 |
|
Byron Hambly
|
b4405ba453
|
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750)
|
2025-03-31 16:37:52 +02:00 |
|
Byron Hambly
|
2d7a0e3e33
|
Merge 3e536ea9ac into merged_master (Bitcoin PR bitcoin/bitcoin#26683)
|
2025-03-31 15:52:04 +02:00 |
|
Byron Hambly
|
7f468ebade
|
Merge 9e59d21fbe into merged_master (Bitcoin PR bitcoin/bitcoin#26592)
|
2025-03-04 11:55:27 +02:00 |
|
Byron Hambly
|
98dd521b76
|
Merge d415b7261c into merged_master (Bitcoin PR bitcoin/bitcoin#26588)
|
2025-03-04 10:43:16 +02:00 |
|
Byron Hambly
|
768d5488c5
|
Merge c239d3dac9 into merged_master (Bitcoin PR bitcoin/bitcoin#26574)
|
2025-03-03 15:12:07 +02:00 |
|
Byron Hambly
|
cfe620f7fd
|
Merge 93cae70d87 into merged_master (Bitcoin PR bitcoin/bitcoin#26561)
|
2025-03-03 14:54:07 +02:00 |
|
Byron Hambly
|
4b3a34be93
|
Merge 85892f77c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25900)
|
2025-03-03 13:42:05 +02:00 |
|
Byron Hambly
|
b5a75af14a
|
Merge 1b680948d4 into merged_master (Bitcoin PR bitcoin/bitcoin#26292)
|
2025-03-03 13:37:42 +02:00 |
|
Byron Hambly
|
89cb20a432
|
Merge 6863ad79a6 into merged_master (Bitcoin PR bitcoin/bitcoin#25112)
|
2025-03-03 09:48:51 +02:00 |
|
Byron Hambly
|
b83abdf89a
|
Merge UP TO e42ba134f4 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26448)
1667577042 2022-11-04T16:50:42+01:00 e42ba134f4 Bitcoin Merge bitcoin/bitcoin#26448: test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055bef Bitcoin Merge bitcoin/bitcoin#26443: doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596a Bitcoin Merge bitcoin/bitcoin#26445: .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984db Bitcoin Merge bitcoin/bitcoin#25248: refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437 Bitcoin Merge bitcoin/bitcoin#26417: test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ec Bitcoin Merge bitcoin/bitcoin#26396: net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990 Bitcoin Merge bitcoin/bitcoin#26437: test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1d Bitcoin Merge bitcoin/bitcoin#25548: gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9 Bitcoin Merge bitcoin/bitcoin#26360: build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24 Bitcoin Merge bitcoin/bitcoin#26294: build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0 Bitcoin Merge bitcoin/bitcoin#26373: Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2 Bitcoin Merge bitcoin/bitcoin#26387: p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981 Bitcoin Merge bitcoin/bitcoin#24051: Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808 Bitcoin Merge bitcoin/bitcoin#26402: doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11 Bitcoin Merge bitcoin/bitcoin#26424: doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63 Bitcoin Merge bitcoin/bitcoin#26404: test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589b Bitcoin Merge bitcoin/bitcoin#26408: test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1 Bitcoin Merge bitcoin/bitcoin#26409: refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02 Bitcoin Merge bitcoin/bitcoin#26377: test: Make `system_tests/run_command` test locale and platform agnostic
|
2025-02-27 13:40:17 +02:00 |
|
Byron Hambly
|
db77bc88b0
|
Merge b8cf7b768d into merged_master (Elements PR #1412)
|
2025-02-13 16:45:58 +02:00 |
|
Pablo Greco
|
49f151f013
|
Apply acc06bc91f fix also to pip upgrade
|
2025-02-13 05:46:30 -08:00 |
|
Pablo Greco
|
a121cf0e63
|
Manually pick acc06bc91f from bitcoin
|
2025-02-13 05:46:30 -08:00 |
|
Hennadii Stepanov
|
cde308e667
|
ci: Use macos-ventura-xcode:14.1 image for "macOS native" task
Github-Pull: #26388
Rebased-From: da16893474
|
2025-02-13 05:46:30 -08:00 |
|
Hennadii Stepanov
|
93218750de
|
ci: Make getopt path architecture agnostic
Github-Pull: #26388
Rebased-From: 702836530f
|
2025-02-13 05:46:30 -08:00 |
|
Hennadii Stepanov
|
d789538aab
|
ci: Improve naming related to "macOS 12 native x86_64" task
Github-Pull: #25444
Rebased-From: 0bb7a1f71d
|
2025-02-13 05:46:30 -08:00 |
|
Byron Hambly
|
c8eb5b8cc1
|
Merge bd551ad186 into merged_master (Elements PR #1393)
|
2025-02-11 15:50:38 +02:00 |
|
Pablo Greco
|
77b3bdd864
|
ci: Use clang-18 in tsan task (Ubuntu 20.04)
Cherry-picked from fabb6af850
Cherry-picked from faf4aca15a
Cherry-picked from fa23c9aa7c
Cherry-picked from fa83b65ef8
Cherry-picked from fa75220ac5
|
2025-02-07 14:49:19 -08:00 |
|
MarcoFalke
|
06b72ec82c
|
ci: Temporarily use clang-13 to work around clang-14 TSan bug
Github-Pull: bitcoin#24572
Rebased-From: fa43933
|
2025-02-07 14:39:33 -08:00 |
|
Pablo Greco
|
daf8ddc7d2
|
CI: Use RockyLinux 8 instead of CentOS Stream 8
|
2025-02-07 05:03:14 -08:00 |
|
Byron Hambly
|
ca0a68b350
|
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
|
2025-02-05 09:50:17 +02:00 |
|
Byron Hambly
|
a6f8dc6a86
|
tidy: fixes for clang tidy ci job
|
2024-12-04 14:16:45 +02:00 |
|
Byron Hambly
|
d78604da4c
|
Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219)
|
2024-12-02 08:51:39 +02:00 |
|
Byron Hambly
|
68e38e5baf
|
Merge 01e1627e25 into merged_master (Bitcoin PR bitcoin/bitcoin#25872)
|
2024-11-25 14:46:13 +02:00 |
|
Byron Hambly
|
b8927c447e
|
Merge 7d82f86341 into merged_master (Bitcoin PR bitcoin/bitcoin#25650)
|
2024-10-25 12:16:28 +02:00 |
|
Byron Hambly
|
79d275ea14
|
Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527)
|
2024-10-25 11:03:47 +02:00 |
|
Byron Hambly
|
12dbf6cb9d
|
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648)
|
2024-10-24 20:20:13 +02:00 |
|
Byron Hambly
|
080268f4dc
|
Merge eeb5a94e27 into merged_master (Bitcoin PR bitcoin/bitcoin#25528)
|
2024-10-24 14:42:59 +02:00 |
|
Byron Hambly
|
b8f629f19f
|
Merge ab3db34836 into merged_master (Bitcoin PR bitcoin/bitcoin#25713)
|
2024-10-24 12:39:56 +02:00 |
|
Byron Hambly
|
5a53b496d2
|
Merge 5671217477 into merged_master (Bitcoin PR bitcoin/bitcoin#24974)
|
2024-10-18 15:11:20 +02:00 |
|
Byron Hambly
|
593c724509
|
Merge c90f86e4c7 into merged_master (Bitcoin PR bitcoin/bitcoin#25694)
|
2024-10-18 14:59:49 +02:00 |
|
Byron Hambly
|
65fbede59b
|
Merge 86133df7a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25662)
|
2024-10-18 12:35:26 +02:00 |
|
Byron Hambly
|
d71cdde1aa
|
Merge 0897b189e4 into merged_master (Bitcoin PR bitcoin/bitcoin#25308)
|
2024-10-17 17:25:50 +02:00 |
|
Byron Hambly
|
21648b79ea
|
Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645)
|
2024-10-17 17:15:38 +02:00 |
|
Byron Hambly
|
076e809b74
|
Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487)
|
2024-10-17 09:16:23 +02:00 |
|
James Dorfman
|
0fc13e69d9
|
Merge 4e2929e987 into merged_master (Bitcoin PR bitcoin/bitcoin#25617)
|
2024-10-16 07:08:03 +00:00 |
|
James Dorfman
|
98c5ad9be1
|
Merge 1d89fc695a into merged_master (Bitcoin PR bitcoin/bitcoin#25324)
|
2024-10-16 05:06:15 +00:00 |
|
James Dorfman
|
1c819b5313
|
Merge bac52a1cfe into merged_master (Bitcoin PR bitcoin/bitcoin#25447)
|
2024-10-13 06:28:07 +00:00 |
|
James Dorfman
|
ec1b070a6a
|
Merge f0e44492d3 into merged_master (Bitcoin PR bitcoin/bitcoin#25530)
|
2024-10-09 05:56:30 +00:00 |
|
Russell O'Connor
|
d5ad21b8a0
|
Lint simplicity subtree
|
2024-10-07 14:39:09 -04:00 |
|
James Dorfman
|
ab7e4a7e86
|
Merge b9122e95f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25444)
|
2024-09-16 05:06:15 +00:00 |
|
James Dorfman
|
ac7b05a27d
|
Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369)
|
2024-09-10 20:10:06 +00:00 |
|
James Dorfman
|
caa3ef8844
|
Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254)
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
|
2024-09-09 18:21:18 +00:00 |
|
James Dorfman
|
57f4c62810
|
Merge f66633d9cb into merged_master (Bitcoin PR bitcoin/bitcoin#25288)
|
2024-09-09 17:47:06 +00:00 |
|
James Dorfman
|
d8162b5189
|
Merge fcde5d1300 into merged_master (Bitcoin PR bitcoin/bitcoin#25255)
|
2024-09-09 17:20:43 +00:00 |
|
James Dorfman
|
e10b3114d3
|
Merge fb7437f66f into merged_master (Bitcoin PR bitcoin/bitcoin#25231)
|
2024-09-06 17:08:42 +00:00 |
|
James Dorfman
|
36a5296ad6
|
Merge bd57b4e0c0 into merged_master (Bitcoin PR bitcoin/bitcoin#24757)
|
2024-09-06 06:36:57 +00:00 |
|