Merged
Conversation
Munkybooty
force-pushed
the
backports-0.18-pr6
branch
from
20942ef to
45608e4
Compare
Munkybooty
force-pushed
the
backports-0.18-pr6
branch
3 times, most recently
from
ff18211 to
4c520b3
Compare
UdjinM6
requested changes
Jul 3, 2021
There was a problem hiding this comment.
Pls rebase (make sure to resolve merge conflicts for 14120 correctly, see UdjinM6@2619b7e) and drop 14135 and 14129 while at it (they were backported in #4220).
Author
|
@UdjinM6 UdjinM6/dash@2619b7e does not seem to lead anywhere. |
Author
|
Disregard, now it leads somewhere. thats so strange the link one my comment works |
Munkybooty
force-pushed
the
backports-0.18-pr6
branch
from
d68c8da to
f3d2167
Compare
|
That's weird.. and also, my commit was broken somehow. Anyway, you should rebase it and fix merge conflicts, simply merging develop into this branch is not enough. I redid 14120 (after rebase, see https://github.com/UdjinM6/dash/commits/pr4227), c526952 should be the right version of it I think. |
…using utf-8 decoding in python 5d62dcf lint: Make sure we read the command line inputs using utf-8 decoding in python (Chun Kuan Lee) Pull request description: Make sure we read the command line inputs using utf-8 decoding in python occurred from travis cron job: contrib/verify-commits/verify-commits.py should run with utf-8, otherwise it would raise UnicodeDecodeError `UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 744: ordinal not in range(128)` Tree-SHA512: 90e4ad57fdbbbecb0a21fc2d2b03a04f5ef125e54124719ef36e5a85326930b732b47534757a7c3a8730096f3947b009ec898191928b5c2d38f9f4b3e37db48d # Conflicts: # contrib/devtools/optimize-pngs.py
… options e9a78e9 doc: Change documentation for =0 for non-boolean options (Wladimir J. van der Laan) Pull request description: PR bitcoin#12713 changed the interpretation for negation of non-boolean options (e.g. -noconnect) to no longer set the option to `0`, but to remove it from the options. I think this is better because it gets rid of the special meaning of `'0'`. However it needs to be documented. I attempt to do so in this PR. Addresses bitcoin#14064. There might be options I missed, please help check: - `-connect` - `-proxy` - `-onion` - `-debug` - `-debuglogfile` Needs a manpage update. Tree-SHA512: a69e63e04a6c8bf6f61a58ddc0f5ebd4b9af7a2e0ea5174e668f2e3edd31a541910a125605ca4bfccf3aca6e59267d98a66de9d1e73650f48c8a1828d315d35d # Conflicts: # src/init.cpp
…ainParams fab5267 doxygen: Remove misleading checkpoints comment in CMainParams (MarcoFalke) Pull request description: This removes the checkpoints comment because it is misleading for two reasons: * It shows up in the doxygen documentation of `CMainParams` https://dev.visucore.com/bitcoin/doxygen/class_c_main_params.html * The comment refers to "strange transactions" in a block, which are not specified further. Transactions in blocks are always consensus-valid or rejected as consensus-invalid. Also sort the includes with `clang-format`, as the file is touched anyway. Tree-SHA512: b75f38dd0422b9310218307cbaa4dd5afa7579612d7dcdf781b8f25626f79c11e090dbcc83a05571f4418220c1a005f6254a9c461534d517ccecf7f1920be6be # Conflicts: # src/chainparams.cpp
…structions, update line in Unix instructions e351a16 Remove reference to deprecated RPC call in build instructions (Michael Goldstein) a6f16f1 Docs: Add disable-wallet section to OSX build instructions (Michael Goldstein) Pull request description: The `disable-wallet` section was mentioned in the `Berkeley DB` section of the OSX build instructions, but the section did not actually exist. This PR ports the section from the Unix build instructions. Tree-SHA512: e32f10f3b92307325f2101e89d3e18c89346916e70117c208ad7441170c4aee65b636ea4f7dd1cb0ecf0e800c1aa7c37fa73125e69ecdd539bc862e651b79b16 # Conflicts: # doc/build-unix.md
dc287c9 Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6 (MarcoFalke) Pull request description: This removes the deprecated `std::pair` wrappers from univalue, so that they are not accidentally re-introduced in our code base. Tree-SHA512: 46f6f7c7c7942a9e131d971c425cbde4159abcc1214235b61139ce97b174024e47b9c52e832cde89fbab9879f43d12c26b64d6def9907bd47883f1e574cf2e2e
Munkybooty
force-pushed
the
backports-0.18-pr6
branch
from
0166ee9 to
b03ee2a
Compare
UdjinM6
requested changes
Jul 7, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
b03ee2a854b276ebdaa5c5910634e815221bcc1a (14120) has some unrelated changes
Munkybooty
force-pushed
the
backports-0.18-pr6
branch
from
ee60af0 to
38c6a59
Compare
|
Recent force-push fixed nothing (no changes in https://github.com/dashpay/dash/compare/ee60af0dc01d71430e36f9a3fb4c6b0c9948a318..38c6a595e3472a7290fb537947d94dd0ba48fb36), still have to backport 14120 properly - it should touch |
fb97437 added note that control port must be enabled and how to do that in torrc config file (Jordan Baczuk) Pull request description: Reopened from bitcoin#13681 because pushes made it unable to reopen. Tree-SHA512: 34eac14308aef70963b630173cd93916201553d5323ab2de3517d4a78604ae5a7cf8691a314c0af00fe36f0ef19b94a4c371d2e7aa1229d9c603d36c51b115fb
Munkybooty
force-pushed
the
backports-0.18-pr6
branch
from
38c6a59 to
3f5588f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.