Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 28, 2015

Caused by a rebase conflict in #6780.

@pstratem
Copy link
Contributor

This seems to be missing something :)

@maflcko
Copy link
Member Author

maflcko commented Nov 29, 2015

@pstratem Indeed, this should be squashed into df66147. But this is already merged so I guess there is nothing I could do about that.

@jonasschnelli
Copy link
Contributor

Oops.
Thanks for fixing!

utACK.

@paveljanik
Copy link
Contributor

ACK

@laanwj laanwj merged commit fa4b627 into bitcoin:master Nov 30, 2015
laanwj added a commit that referenced this pull request Nov 30, 2015
fa4b627 Move blocksonly parameter interaction to InitParameterInteraction() (MarcoFalke)
@maflcko maflcko deleted the MarcoFalke-2015-initParam branch November 30, 2015 10:35
@dcousens
Copy link
Contributor

ACK

zkbot added a commit to zcash/zcash that referenced this pull request Mar 31, 2021
Add -blocksonly option

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6993
- bitcoin/bitcoin#7046
- bitcoin/bitcoin#6780
  - The third commit (we backported the rest in #2390).
- bitcoin/bitcoin#7126
- bitcoin/bitcoin#7439
- bitcoin/bitcoin#15990
  - Only the `-blocksonly` documentation changes.
- bitcoin/bitcoin#16555
- bitcoin/bitcoin#18391
  - Only the `-blocksonly` documentation changes.

Part of #2074.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants