Closes #1680, temporary fix for rpc deadlock inherited from upstream. #1847

Merged
merged 1 commit into from Nov 15, 2016

Conversation

Projects
None yet
4 participants
@bitcartel
Contributor

bitcartel commented Nov 11, 2016

No description provided.

@ebfull

This comment has been minimized.

Show comment
Hide comment
@ebfull

ebfull Nov 13, 2016

Contributor

Let's have a ticket regarding re-enabling this (and other things mentioned in the comments) and reference the ticket from the comments in this PR.

Contributor

ebfull commented Nov 13, 2016

Let's have a ticket regarding re-enabling this (and other things mentioned in the comments) and reference the ticket from the comments in this PR.

@bitcartel

This comment has been minimized.

Show comment
Hide comment
@bitcartel

bitcartel Nov 14, 2016

Contributor

@ebfull Added ticket #1856 to comments. Please review and ACK.

Contributor

bitcartel commented Nov 14, 2016

@ebfull Added ticket #1856 to comments. Please review and ACK.

@ebfull

This comment has been minimized.

Show comment
Hide comment
@ebfull

ebfull Nov 15, 2016

Contributor

ACK

@zkbot r+

Contributor

ebfull commented Nov 15, 2016

ACK

@zkbot r+

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Nov 15, 2016

Contributor

📌 Commit fd0fe09 has been approved by ebfull

Contributor

zkbot commented Nov 15, 2016

📌 Commit fd0fe09 has been approved by ebfull

zkbot pushed a commit that referenced this pull request Nov 15, 2016

zkbot
Auto merge of #1847 - bitcartel:1680_rpckeepalive_deadlock, r=ebfull
Closes #1680, temporary fix for rpc deadlock inherited from upstream.
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Nov 15, 2016

Contributor

⌛️ Testing commit fd0fe09 with merge f9970fa...

Contributor

zkbot commented Nov 15, 2016

⌛️ Testing commit fd0fe09 with merge f9970fa...

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Nov 15, 2016

Contributor

💔 Test failed - zcash

Contributor

zkbot commented Nov 15, 2016

💔 Test failed - zcash

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Nov 15, 2016

Contributor

@bitcartel per the test failure, the RPC test httpbasics.py needs updating.

Contributor

str4d commented Nov 15, 2016

@bitcartel per the test failure, the RPC test httpbasics.py needs updating.

@bitcartel

This comment has been minimized.

Show comment
Hide comment
@bitcartel

bitcartel Nov 15, 2016

Contributor

@zkbot retry

Contributor

bitcartel commented Nov 15, 2016

@zkbot retry

@ebfull

This comment has been minimized.

Show comment
Hide comment
@ebfull

ebfull Nov 15, 2016

Contributor

@zkbot r+

Contributor

ebfull commented Nov 15, 2016

@zkbot r+

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Nov 15, 2016

Contributor

📌 Commit f4404d7 has been approved by ebfull

Contributor

zkbot commented Nov 15, 2016

📌 Commit f4404d7 has been approved by ebfull

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Nov 15, 2016

Contributor

⌛️ Testing commit f4404d7 with merge 4e72614...

Contributor

zkbot commented Nov 15, 2016

⌛️ Testing commit f4404d7 with merge 4e72614...

zkbot pushed a commit that referenced this pull request Nov 15, 2016

zkbot
Auto merge of #1847 - bitcartel:1680_rpckeepalive_deadlock, r=ebfull
Closes #1680, temporary fix for rpc deadlock inherited from upstream.
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Nov 15, 2016

Contributor

☀️ Test successful - zcash

Contributor

zkbot commented Nov 15, 2016

☀️ Test successful - zcash

@zkbot zkbot merged commit f4404d7 into zcash:master Nov 15, 2016

1 check passed

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