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

[stable]: backport #10984 #11212

Merged
merged 2 commits into from
Nov 8, 2019
Merged

[stable]: backport #10984 #11212

merged 2 commits into from
Nov 8, 2019

Conversation

seunlanlege
Copy link
Member

@ordian ordian added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Oct 28, 2019
@ordian ordian added this to the Patch milestone Oct 28, 2019
ordian
ordian previously approved these changes Oct 28, 2019
Copy link
Collaborator

@ordian ordian left a comment

Choose a reason for hiding this comment

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

Looks sane.

@dvdplm
Copy link
Collaborator

dvdplm commented Oct 28, 2019

looks good to me but I wonder if it's the right branch? @s3krit should it be against the upcoming release, v2.5.10-stable?

@soc1c
Copy link
Contributor

soc1c commented Nov 2, 2019

That doesn't matter @dvdplm

Question I have, doesn't we need this in Beta too?

@soc1c soc1c changed the base branch from stable to v2.5.10-stable November 5, 2019 11:19
@soc1c
Copy link
Contributor

soc1c commented Nov 5, 2019

Changed the base for #11239

Could you resolve conflicts and merge?

@seunlanlege seunlanlege merged commit dd10c0d into v2.5.10-stable Nov 8, 2019
@seunlanlege seunlanlege deleted the seun-backport-10984 branch November 8, 2019 10:57
dvdplm added a commit that referenced this pull request Nov 8, 2019
…m into v2.5.10-stable

* 'v2.5.10-stable' of github.com:paritytech/parity-ethereum:
  [stable]: backport #10984 (#11212)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants