Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
838d729
Initial commit
cecton Apr 7, 2020
34c80e0
Change substrate and polkadot branch to cecton-cumulus-branch
cecton Apr 7, 2020
94571a5
WIP
cecton Apr 7, 2020
730390a
WIP
cecton Apr 7, 2020
73543b2
WIP
cecton Apr 7, 2020
fd70177
WIP
cecton Apr 7, 2020
911645f
WIP
cecton Apr 8, 2020
132bfea
WIP
cecton Apr 8, 2020
df1e696
WIP
cecton Apr 8, 2020
45db8aa
WIP
cecton Apr 8, 2020
b173102
WIP
cecton Apr 8, 2020
bb9e23b
WIP
cecton Apr 8, 2020
e16af0a
WIP
cecton Apr 8, 2020
5880ab1
update .editorconfig
cecton Apr 8, 2020
5fbdbc0
should probably be --dev
cecton Apr 8, 2020
17f36db
formatting
cecton Apr 8, 2020
c7e6723
Change substrate & polkadot branch to cecton-keep-unpinned-para-blocks
cecton Apr 8, 2020
3c3b103
WIP
cecton Apr 8, 2020
dadf70c
WIP
cecton Apr 8, 2020
2de11f8
WIP
cecton Apr 8, 2020
04b57c7
WIP
cecton Apr 9, 2020
8af9a33
WIP
cecton Apr 9, 2020
06a2b6d
WIP
cecton Apr 9, 2020
152f041
Update polkadot & substrate branches
cecton Apr 9, 2020
1fde472
WIP
cecton Apr 9, 2020
2711ef0
Merge branch 'cecton-cumulus-branch' into cecton-keep-unpinned-para-b…
cecton Apr 9, 2020
786dbaf
Some fixes
bkchr Apr 10, 2020
c455b98
Updated polkadot
cecton Apr 10, 2020
f4ed303
Merge branch 'cecton-cumulus-branch' into cecton-keep-unpinned-para-b…
cecton Apr 10, 2020
d856406
WIP
cecton Apr 15, 2020
74a291e
WIP
cecton Apr 20, 2020
7b90a9d
Merge commit 7431075d0131d9df25ea26f11ccc86e8c080cb5d (conflicts)
cecton Apr 21, 2020
280ad92
Merge commit b9793bc2f69ade2c7e2780d88c5dbedfc6adb7d0 (no conflict)
cecton Apr 21, 2020
3fc94f9
Cargo.lock
cecton Apr 21, 2020
402da3c
WIP
cecton Apr 21, 2020
78e7614
WIP
cecton Apr 22, 2020
dc50e02
Update substrate & polkadot branches
cecton Apr 22, 2020
67c7003
Clean-up
cecton Apr 22, 2020
d08f452
WIP
cecton Apr 22, 2020
7961e9a
WIP
cecton Apr 22, 2020
124dbc3
WIP
cecton Apr 22, 2020
ff626ac
WIP
cecton Apr 24, 2020
562caab
WIP
cecton Apr 27, 2020
33e2efe
Use JustifiedBlockAnnounceValidator
cecton Apr 28, 2020
2404121
debug
cecton Apr 28, 2020
63613cc
Revert "debug"
cecton Apr 28, 2020
2c914c7
Revert "Use JustifiedBlockAnnounceValidator"
cecton Apr 28, 2020
2febd33
Revert branch to cumulus-branch
cecton Apr 28, 2020
9264807
clean-up
cecton Apr 28, 2020
94e0455
clean-up
cecton Apr 28, 2020
a6b4fec
cleanup
cecton Apr 28, 2020
b2957a1
cleanup
cecton Apr 28, 2020
377ebf1
Update branches
cecton Apr 29, 2020
be519b2
debug
cecton Apr 29, 2020
0c82c85
Cancel previous task when new one is created
cecton Apr 30, 2020
5c22c2d
Remove stream-cancel
cecton Apr 30, 2020
c3c1ad5
Clean-up
cecton Apr 30, 2020
b968c26
cleanup
cecton Apr 30, 2020
5deb2ad
cleanup
cecton Apr 30, 2020
c744ebd
Merge commit cd7e06c6439f6b9022f0b52e159e20b01d8542a1 (conflicts)
cecton May 5, 2020
9bdcaa7
Merge commit aaee2b410e6f4159552ad32cb9ee3813c969d8b4 (no conflict)
cecton May 5, 2020
54e2632
Fix merge issue
cecton May 5, 2020
aa15d45
Update polkadot_chainspec.json
cecton May 5, 2020
d3dfe3b
Update network/src/lib.rs
cecton May 5, 2020
995b907
Update network/src/lib.rs
cecton May 5, 2020
497cecf
Use closure instead of NetworkService to announce_block
cecton May 5, 2020
616d0bc
doc
cecton May 5, 2020
50a7c16
WIP
cecton May 5, 2020
cbdcfff
Move disable announcement to its own function with doc
cecton May 6, 2020
c097c63
Merge commit bd14f0ed0c42198354295a73a39daf32a60cb26f (no conflict)
cecton May 6, 2020
19cab74
Merge commit 45a7fe2a94be55a7056f4e14b1d443fb3cecc08b (conflicts)
cecton May 6, 2020
fffde6b
Change substrate and polkadot branch to cumulus-master
cecton May 6, 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 commit aaee2b4 (no conflict)
Parent branch: origin/master
Forked at: cd1eb37
  • Loading branch information
cecton committed May 5, 2020
commit 9bdcaa7bd12626614990d4c76a3bc64b4c3c1d83

This merge commit was added into this branch cleanly.

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