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

stable backports v2.1.11 #10112

Merged
merged 7 commits into from
Jan 7, 2019
Merged

stable backports v2.1.11 #10112

merged 7 commits into from
Jan 7, 2019

Conversation

5chdn
Copy link
Contributor

@5chdn 5chdn commented Dec 28, 2018

@5chdn 5chdn added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. A8-backport 🕸 Pull request is already reviewed well in another branch. M2-config 📂 Chain specifications and node configurations. labels Dec 28, 2018
@5chdn 5chdn added this to the Patch milestone Dec 28, 2018
varasev and others added 3 commits January 2, 2019 16:30
* HF in POA Sokol (2019-01-04)

poanetwork/poa-chain-spec#91

* Update POA Core bootnodes
* ethcore: update hardcoded headers for foundation

* ethcore: update hardcoded headers for ropsten

* ethcore: update hardcoded headers for kovan

* ethcore: use consistant formatting

* ethcore: restore spaces after colon in chain spec

* ethcore: fix bootnodes in chain specs

* ethcore: fix bootnodes in chain specs

* ethcore: enforce newline at the end of chainspecs
@5chdn 5chdn added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Jan 4, 2019
jam10o-new and others added 3 commits January 4, 2019 14:25
* fix #10125

fix service transaction version detection if --identity is enabled, change test to match how --identity actually works

* fix wrong var

* get the index of  v, not /

* idx, not idx.len()

* Update ethcore/sync/src/chain/propagator.rs

Co-Authored-By: joshua-mir <[email protected]>

* Update ethcore/sync/src/chain/propagator.rs

Co-Authored-By: joshua-mir <[email protected]>

* change version prefix to a const

* space

Co-Authored-By: joshua-mir <[email protected]>
@5chdn 5chdn merged commit e9194b0 into stable Jan 7, 2019
@5chdn 5chdn deleted the a5-stable-2111 branch January 7, 2019 10:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-pleasereview 🤓 Pull request needs code review. A8-backport 🕸 Pull request is already reviewed well in another branch. M2-config 📂 Chain specifications and node configurations.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants