diff options
| author | fanquake <fanquake@gmail.com> | 2021-11-16 10:44:06 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-11-16 11:22:06 +0800 |
| commit | ffdab41f94521dc87e68a160546af55355340af5 (patch) | |
| tree | 9040f47fe6bff569f940a8bcae23aec77f4643c4 /test/functional/combine_logs.py | |
| parent | 0475a2378bbfbc96b60e1bb8e816533e0e7a9e5d (diff) | |
| parent | fac23c211407a77af82bb1491c48c8d37022c8b3 (diff) | |
Merge bitcoin/bitcoin#23474: test: scripted-diff cleanups after generate* changes
fac23c211407a77af82bb1491c48c8d37022c8b3 scripted-diff: Bump copyright headers (MarcoFalke)
fa974f1f1417a536636347072e86bcb54a4c909c scripted-diff: Remove redundant sync_all and sync_blocks (MarcoFalke)
fad13991aea6463ecf07dd907de1c1b23837d7e7 test: Properly set sync_fun in NodeNetworkLimitedTest (MarcoFalke)
faeff577093c4de9eec9491486a2c3766d46dae6 test: Use 4 spaces for indentation (MarcoFalke)
Pull request description:
Some cleanups after commit 94db963de501e4aba6e5d8150a01ceb85753dee1
ACKs for top commit:
fanquake:
ACK fac23c211407a77af82bb1491c48c8d37022c8b3
Tree-SHA512: 5acfd5bb9679b41969d0fc6fc85801ccadcd6530ea692bac6352668e06fc7a9b0e1db3fd6fba435e84afe983d2eb07bd0a47c8364462bb7110004bd3d102b698
Diffstat (limited to 'test/functional/combine_logs.py')
| -rwxr-xr-x | test/functional/combine_logs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/combine_logs.py b/test/functional/combine_logs.py index 71dfb4c01a..33c81bde13 100755 --- a/test/functional/combine_logs.py +++ b/test/functional/combine_logs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2019 The Bitcoin Core developers +# Copyright (c) 2017-2021 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Combine logs from multiple bitcoin nodes as well as the test_framework log. |