New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 0.12][RPC] quickfix for RPC timer interface problem #7318

Merged
merged 1 commit into from Jan 8, 2016

Conversation

Projects
None yet
5 participants
@jonasschnelli
Member

jonasschnelli commented Jan 8, 2016

Taking the last interface will always result in preferring the non QT timer interface which results in walletpassphase re-locking correctly over RPC and over the GUI console.
Should fix #7316 for 0.12.

Clean fix for master is in #7317.

@jonasschnelli jonasschnelli added this to the 0.12.0 milestone Jan 8, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jan 8, 2016

Member

utACK

Member

laanwj commented Jan 8, 2016

utACK

@jonasschnelli jonasschnelli changed the title from Backport: quickfix for RPC timer interface problem to [Backport 0.12][RPC] quickfix for RPC timer interface problem Jan 8, 2016

@btcdrak

This comment has been minimized.

Show comment
Hide comment
@btcdrak

btcdrak Jan 8, 2016

Member

utACK daa8da2

Member

btcdrak commented Jan 8, 2016

utACK daa8da2

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Jan 8, 2016

Member

Tested ACK 9490ec3 (which should be similar to daa8da2), indeed fixes #7316 (comment).

Member

MarcoFalke commented Jan 8, 2016

Tested ACK 9490ec3 (which should be similar to daa8da2), indeed fixes #7316 (comment).

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jan 8, 2016

Member

utACK

Member

laanwj commented Jan 8, 2016

utACK

@laanwj laanwj merged commit daa8da2 into bitcoin:0.12 Jan 8, 2016

1 check passed

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

laanwj added a commit that referenced this pull request Jan 8, 2016

Merge pull request #7318
daa8da2 Backport: quickfix for RPC timer interface problem (Jonas Schnelli)
@luke-jr

This comment has been minimized.

Show comment
Hide comment
@luke-jr

luke-jr Feb 11, 2016

Member

In the future, please put these kind of details in the commit message itself. :/

Member

luke-jr commented Feb 11, 2016

In the future, please put these kind of details in the commit message itself. :/

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Feb 13, 2016

Member

Right, if you are doing the rebase anyway, additional info like in a74fa1f is helpful. If a rebase is not necessary, a new pull should be created anyway, so the commit ends up in the release note logs.

Member

MarcoFalke commented Feb 13, 2016

Right, if you are doing the rebase anyway, additional info like in a74fa1f is helpful. If a rebase is not necessary, a new pull should be created anyway, so the commit ends up in the release note logs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment