backport: Merge bitcoin#29009, 29079 #7080
+30
−17
Merged
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7080,
conflictPrs: [
{
number: 6934,
files: [
'src/Makefile.am',
'src/chainlock/chainlock.cpp',
'src/chainlock/signing.cpp',
'src/coinjoin/client.cpp',
'src/coinjoin/coinjoin.cpp',
'src/coinjoin/server.cpp',
'src/dsnotificationinterface.cpp',
'src/evo/mnauth.cpp',
'src/governance/governance.cpp',
'src/governance/governance.h',
'src/governance/object.cpp',
'src/governance/signing.cpp',
'src/governance/vote.cpp',
'src/init.cpp',
'src/instantsend/instantsend.cpp',
'src/instantsend/instantsend.h',
'src/instantsend/signing.cpp',
'src/llmq/context.cpp',
'src/llmq/ehf_signals.cpp',
'src/llmq/quorums.cpp',
'src/llmq/signing.cpp',
'src/llmq/signing.h',
'src/llmq/signing_shares.cpp',
'src/llmq/signing_shares.h',
'src/masternode/active/context.cpp',
'src/masternode/active/notificationinterface.cpp',
'src/masternode/active/notificationinterface.h',
'src/masternode/payments.cpp',
'src/masternode/sync.cpp',
'src/masternode/utils.cpp',
'src/msg_result.h',
'src/net.cpp',
'src/net.h',
'src/net_governance.cpp',
'src/net_governance.h',
'src/net_instantsend.cpp',
'src/net_instantsend.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/net_signing.cpp',
'src/net_signing.h',
'src/node/chainstate.cpp',
'src/node/context.cpp',
'src/node/interfaces.cpp',
'src/node/sync.cpp',
'src/node/sync.h',
'src/rpc/governance.cpp',
'src/rpc/mining.cpp',
'src/rpc/node.cpp',
'src/rpc/quorums.cpp',
'src/test/util/net.h',
'src/test/util/setup_common.cpp',
'src/validation.h',
'src/wallet/interfaces.cpp',
'test/lint/lint-circular-dependencies.py'
],
conflicts: [ 'src/test/util/net.h' ]
},
{
number: 6845,
files: [
'src/crypto/ripemd160.cpp',
'src/crypto/ripemd160.h',
'src/crypto/sha1.cpp',
'src/crypto/sha1.h',
'src/crypto/sha256.cpp',
'src/crypto/sha256.h',
'src/crypto/sha512.cpp',
'src/crypto/sha512.h',
'src/cuckoocache.h',
'src/dbwrapper.h',
'src/key.h',
'src/policy/fees.cpp',
'src/policy/fees.h',
'src/serialize.h',
'src/span.h',
'src/streams.h',
'src/support/lockedpool.cpp',
'src/support/lockedpool.h',
'src/test/util/net.h',
'src/tinyformat.h',
'src/torcontrol.cpp',
'src/torcontrol.h',
'src/univalue/include/univalue_utffilter.h',
'src/util/sock.h',
'src/wallet/bdb.cpp',
'src/wallet/bdb.h',
'src/wallet/db.h',
'src/wallet/wallet.h',
'src/zmq/zmqabstractnotifier.h',
'src/zmq/zmqnotificationinterface.h',
'test/functional/p2p_getaddr_caching.py',
'test/functional/test_framework/test_node.py'
],
conflicts: [ 'src/test/util/net.h' ]
}
]
}
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading