Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix deadlock_detection feature branch compilation #8824

Merged
merged 1 commit into from
Jun 8, 2018

Conversation

ordian
Copy link
Collaborator

@ordian ordian commented Jun 6, 2018

The compilation of cargo build --features deadlock_detection broke in #8783.
But CI ignores it anyway.

@ordian ordian added A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). M4-core ⛓ Core client code / Rust. labels Jun 6, 2018
@parity-cla-bot
Copy link

It looks like @ordian signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@5chdn 5chdn added this to the 1.12 milestone Jun 6, 2018
@niklasad1 niklasad1 added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 8, 2018
@niklasad1 niklasad1 merged commit a48ed02 into openethereum:master Jun 8, 2018
@ordian ordian deleted the deadlock-detection branch June 8, 2018 09:42
dvdplm added a commit that referenced this pull request Jun 11, 2018
* master:
  Fix subcrate test compile (#8862)
  network-devp2p: downgrade logging to debug, add target (#8784)
  Clearing up a comment about the prefix for signing (#8828)
  Disable parallel verification and skip verifiying already imported txs. (#8834)
  devp2p: Move UDP socket handling from Discovery to Host. (#8790)
  Fixed AuthorityRound deadlock on shutdown, closes #8088 (#8803)
  Specify critical release flag per network (#8821)
  Fix `deadlock_detection` feature branch compilation (#8824)
  Use system allocator when profiling memory (#8831)
  added from and to to Receipt (#8756)
ordian added a commit to ordian/parity that referenced this pull request Jun 20, 2018
…rp_sync_on_light_client

* 'master' of https://github.com/paritytech/parity:
  Fix `deadlock_detection` feature branch compilation (openethereum#8824)
  Use system allocator when profiling memory (openethereum#8831)
  added from and to to Receipt (openethereum#8756)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants