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

overseer: fix build #1596

Merged
2 commits merged into from
Aug 17, 2020
Merged

overseer: fix build #1596

2 commits merged into from
Aug 17, 2020

Conversation

ordian
Copy link
Member

@ordian ordian commented Aug 17, 2020

Looks like something went wrong when #1557 was merged into master it didn't account for #1590.

@ordian ordian added A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Aug 17, 2020
@github-actions github-actions bot added the A0-please_review Pull request needs code review. label Aug 17, 2020
type Output = Collation;

fn poll(self: Pin<&mut Self>, _cx: &mut futures::task::Context) -> Poll<Self::Output> {
panic!("at the Disco")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🕺

@rphmeier
Copy link
Contributor

bot merge

@ghost
Copy link

ghost commented Aug 17, 2020

Trying merge.

@ghost ghost merged commit c61d907 into master Aug 17, 2020
@ghost ghost deleted the ao-fix-build branch August 17, 2020 16:24
ordian added a commit that referenced this pull request Aug 17, 2020
* master:
  overseer: fix build (#1596)
  Companion PR for #6862 (#1564)
  implement collation generation subsystem (#1557)
  Add spawn_blocking to SubsystemContext (#1570)
  Companion PR for #6846 (#1568)
  overseer: add a test to ensure all subsystem receive msgs (#1590)
  Implementer's Guide: Flesh out more details for upward messages (#1556)
  Make parachain validation wasm executor functional (#1574)
  Use async test helper to simplify node testing (#1578)
  guide: validation data refactoring (#1576)
  Remove v0 parachains runtime (#1501)
  [CI] Add github token to generate-release-text (#1581)
  Allow using any polkadot client instead of enum Client (#1575)
  service/src/lib: Update authority discovery construction (#1563)
  Update .editorconfig to what we have in practice (#1545)
  Companion PR for substrate #6672 (#1560)
  pre-redenomination tockenSymbol change (#1561)
ordian added a commit that referenced this pull request Aug 17, 2020
ordian added a commit that referenced this pull request Aug 19, 2020
…n-race-condition

* master:
  initial prometheus metrics (#1536)
  Companion for Substrate 6868 (WeightInfo for System, Utility, and Timestamp) (#1606)
  Promote `HrmpChannelId` and supply more docs (#1595)
  move AssignmentKind and CoreAssigment to scheduler (#1571)
  overseer: fix build (#1596)
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants