/bitcoin

Properly forbid -salvagewallet and -zapwallettxes for multi wallet. #10816

Merged
merged 1 commit into from Jul 15, 2017
+8 −4

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Wallet
Projects
None yet
Milestone
  0.15.0
9 participants
@morcos @luke-jr @MarcoFalke @jnewbery @achow101 @TheBlueMatt @sipa @laanwj @fanquake
@morcos
Contributor

morcos commented Jul 13, 2017

Please tag 0.15

SoftSetBoolArg returns false if the argument was set either way.
@luke-jr
Member

luke-jr commented Jul 13, 2017

Good catch, utACK.
@MarcoFalke
Member

MarcoFalke commented Jul 13, 2017

laanwj added this to the 0.15.0 milestone Jul 13, 2017

@jnewbery
Member

jnewbery commented Jul 13, 2017

utACK dd97a52. Needs to go in for 0.15

fanquake added the Wallet label Jul 13, 2017

@achow101
Contributor

achow101 commented Jul 14, 2017

utACK dd97a52
@TheBlueMatt
Contributor

TheBlueMatt commented Jul 14, 2017

utACK dd97a52
@sipa
Owner

sipa commented Jul 15, 2017

utACK dd97a52

@sipa sipa merged commit dd97a52 into bitcoin:master Jul 15, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@sipa sipa added a commit that referenced this pull request Jul 15, 2017

@sipa sipa Merge #10816: Properly forbid -salvagewallet and -zapwallettxes for m… 
…ulti wallet.


dd97a52 Properly forbid -salvagewallet and -zapwallettxes for multi wallet. (Alex Morcos)

Tree-SHA512: dcde8f854ae957b4d3af4bcf1b811e0b6e9b93602764f86499e46a28d304cd4ee93ba058c03f6ca74ccb60e1310c83e53b698c64d93e5503115377655b80d44d
This commit was signed with a verified signature.
@sipa sipa Pieter Wuille
GPG key ID: A636E97631F767E0 Learn about signing commits
1c011ff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment