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

Switch GrandPa to new futures #3909

Closed
tomaka wants to merge 11 commits into from
Closed

Switch GrandPa to new futures #3909

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b21d51c
Switch GrandPa to new futures
tomaka Aug 5, 2019
a25be8e
Merge remote-tracking branch 'upstream/master' into HEAD
tomaka Oct 24, 2019
513704d
Merge remote-tracking branch 'upstream/master' into HEAD
tomaka Oct 28, 2019
6007c2b
Work on making tests work
tomaka Oct 28, 2019
46f3728
until_imported tests working again
tomaka Oct 28, 2019
6f6849a
Work on switching tests to stable futures
tomaka Oct 28, 2019
7c4f79b
Merge remote-tracking branch 'parity/master' into HEAD
expenses Jan 10, 2020
c1dd9e5
Modifications
expenses Jan 13, 2020
6737632
Merge remote-tracking branch 'parity/master' into ashley-grandpa-futures
expenses Jan 13, 2020
46a6822
Re-add test as #[ignore]
expenses Jan 13, 2020
5d32d1e
Merge pull request #2 from paritytech/ashley-grandpa-futures
tomaka Jan 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'parity/master' into ashley-grandpa-futures
  • Loading branch information
@expenses
expenses committed Jan 13, 2020
commit 67376328771710dd024952ff8b5cbb2fc724a937

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.