aboutsummaryrefslogtreecommitdiff
path: root/src/httpserver.cpp
diff options
context:
space:
mode:
authorfanquake <[email protected]>2019-08-01 07:36:13 +0800
committerfanquake <[email protected]>2019-08-01 07:54:46 +0800
commit25f0edd59fee454495da39c6c63f19b97cd75e96 (patch)
tree9ff0df42ce6f78a071cb244b01ddc787c68d226c /src/httpserver.cpp
parentMerge #16293: test: Make test cases separate functions (diff)
parentdoc: add note on precedence of options in bitcoin.conf (diff)
downloaddiscoin-25f0edd59fee454495da39c6c63f19b97cd75e96.tar.xz
discoin-25f0edd59fee454495da39c6c63f19b97cd75e96.zip
Merge #16448: doc: add note on precedence of options in bitcoin.conf
fa2f991fa23fcc2c96d48fc3dd7faa41c959e8ae doc: add note on precedence of options in bitcoin.conf (Torkel Rogstad) Pull request description: This was a good addition to the docs, but the PR was closed. So I've cherry-picked the commit and fixed up Russ's comments as well as the linter issue. ACKs for top commit: laanwj: ACK fa2f991fa23fcc2c96d48fc3dd7faa41c959e8ae hebasto: ACK fa2f991fa23fcc2c96d48fc3dd7faa41c959e8ae, I have reviewed the code and it looks OK, I agree it can be merged. jamesob: ACK https://github.com/bitcoin/bitcoin/commit/fa2f991fa23fcc2c96d48fc3dd7faa41c959e8ae jonatack: ACK fa2f991fa23fcc2c96d48fc3dd7faa41c959e8ae ryanofsky: ACK fa2f991fa23fcc2c96d48fc3dd7faa41c959e8ae. Only suggested changes since previous review. Tree-SHA512: d8e7bac19e85ad32205652c3c3036766c611cae52e6e3e8af66a2da054659d914dc153d0cf4ace9c0fa7b41f2a8d74d0edd8d83fe7e984b93d70c01a388cf8ec
Diffstat (limited to 'src/httpserver.cpp')
0 files changed, 0 insertions, 0 deletions