Rebased others #4401
Merged
Rebased others #4401
Conversation
This file contains 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
Rebased by moneromooo, with a sensible commit message
Rebased and squashed by moneromooo
'outputs' option allows to specify the number of separate outputs of smaller denomination that will be created by sweep operation. rebased by moneromooo
Implemented strategy splits total amount into N equal parts, where N is a specified number of outputs. If N > 1, dummy change output is NOT created. rebased by moneromooo
rebased by moneromooo
rebased by moneromooo
This was referenced Sep 18, 2018
fluffypony
added a commit
that referenced
this pull request
Sep 21, 2018
6690190 README: harmonize command formatting inside README.md (Andrea) 8cd9840 disable AES on s390x architecture (Tuan M. Hoang) 4ed30ba wallet: implement coin splitting for sweep_* 'outputs' option (whythat) 24f5239 wallet: add 'outputs' option for sweep_* commands (whythat) 52e19d6 README: Compile boost with cxxflags=-fPIC cflags=-fPIC (Italocoin Project) 0c77523 README: fill in libsodium package name for Arch (phloatingman)
| @@ -116,6 +116,52 @@ X's indicate that these details have not been determined as of commit date. | |||
|
|
|||
| Approximately three months prior to a scheduled software upgrade, a branch from Master will be created with the new release version tag. Pull requests that address bugs should then be made to both Master and the new release branch. Pull requests that require extensive review and testing (generally, optimizations and new features) should *not* be made to the release branch. | |||
|
|
|||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Why did this get approved? Has @fluffypony ever rejected or commented on a PR? To me it seems they simply get merged without further look.
There was a problem hiding this comment.
@leonklingele this was fied in #4416
There was a problem hiding this comment.
@leonklingele what do you expect from a guy who thinks merging code is a button mashing exercise? [ 1 ]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Various PRs which the authors did not rebase when needed:
3032
3496
3647
3738
3937