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
45 commits
Select commit Hold shift + click to select a range
c364f6b
Add Rococo test network
bkchr Jul 6, 2020
0fd5d0a
Correct license header
bkchr Jul 6, 2020
1cd4cb7
Merge remote-tracking branch 'origin/master' into bkchr-rococo
bkchr Jul 7, 2020
1f20fad
Merge remote-tracking branch 'origin/master' into bkchr-rococo
bkchr Jul 9, 2020
689f18d
Add bootNodes address
evaldofelipe Jul 9, 2020
4f99f98
Fix compile errors
bkchr Jul 9, 2020
d8b06a7
Change bootNodes
evaldofelipe Jul 9, 2020
4191e7a
Change rococo bootNodes
evaldofelipe Jul 10, 2020
c31e6b2
Add new bootNodes
evaldofelipe Jul 10, 2020
5e823e0
Fix bootNodes typo
evaldofelipe Jul 10, 2020
d1c52f9
Remove public telemetry
ddorgan Jul 10, 2020
1464f7a
Add rococo-local chain spec
bkchr Jul 10, 2020
b478a40
Remove staking
cecton Jul 12, 2020
bb444c1
Remove staking from chain spec
cecton Jul 12, 2020
4c5502e
use rococo-staging chain spec and preserve bootnodes
cecton Jul 12, 2020
6f36add
Same but with --raw
cecton Jul 12, 2020
c11827d
update chain name and remove telemetry
ddorgan Jul 13, 2020
a176aac
Empty commit to re-trigger CI
cecton Jul 27, 2020
778c875
Fix revision (temp. until I merge master)
cecton Jul 27, 2020
183d971
Merge commit 3f8cfb7d806802915a396087fcd346522d27f76a (conflicts)
cecton Jul 27, 2020
d88a878
Merge commit feb5039e85f7ccd219fd8c3996b55f07565c1f6a (no conflict)
cecton Jul 27, 2020
cf59638
Revert to branch = master to avoid conflicts
cecton Jul 27, 2020
da558f8
Merge commit 11fabd12072bb651a8cbd3157bb4dabff364950d (no conflict)
cecton Jul 27, 2020
257fbc5
Merge commit fe00c791184ad311287b20e8fb7f9e0cd2d54315 (conflicts)
cecton Jul 27, 2020
ed09890
Revert to branch = master to avoid conflicts
cecton Jul 27, 2020
c1dc495
Merge commit f50db053f0e7790fdb8de5d17eb0806ccefb3383 (no conflict)
cecton Jul 27, 2020
a159f12
Disable test (temp)
cecton Jul 27, 2020
3268153
Merge commit 08995278b9627c93ce564985b58643cef76badb0 (conflicts)
cecton Jul 27, 2020
48250a2
Merge branch 'bkchr-rococo' of github.com:paritytech/polkadot into bk…
cecton Jul 27, 2020
fce9203
Revert to branch = master to avoid conflicts
cecton Jul 27, 2020
3881f8e
Merge commit f25628ac315efd5fdb2534a2b557eec8a97fd9cd (no conflict)
cecton Jul 27, 2020
3569706
Merge commit 38f5cbc1847d2d8707e916ad969d7499be431665 (conflicts)
cecton Jul 27, 2020
0f7c7ef
Revert to branch = master to avoid conflicts
cecton Jul 27, 2020
aed72e8
Merge commit b838b386a04fd378d12e5c0c924336b02800e4ae (no conflict)
cecton Jul 27, 2020
e25fead
Change bootNodes IPs for second rococo network
evaldofelipe Jul 27, 2020
dd1f1d9
Revert "Disable test (temp)"
cecton Jul 27, 2020
6863add
Revert purchase
cecton Jul 27, 2020
deb4225
Merge remote-tracking branch 'origin/master' into bkchr-rococo
bkchr Jul 30, 2020
7d470bc
Merge remote-tracking branch 'origin/master' into bkchr-rococo
bkchr Jul 31, 2020
5cdf273
Update chain spec
bkchr Jul 31, 2020
d7ce638
FUUU
bkchr Jul 31, 2020
8887b9c
Merge remote-tracking branch 'origin/master' into bkchr-rococo
bkchr Aug 3, 2020
465e348
Update service/src/lib.rs
bkchr Aug 3, 2020
fcb0ae9
Update runtime/rococo/src/lib.rs
bkchr Aug 3, 2020
df0c1f0
Fix compilation
bkchr Aug 4, 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 'origin/master' into bkchr-rococo
  • Loading branch information
bkchr committed Jul 7, 2020
commit 1cd4cb7456b6eebc5125441bfb6a9aa6d3934374

This merge commit was added into this branch cleanly.

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