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

Beta Backports#2396

Merged
arkpar merged 4 commits into
betafrom
betabackports
Sep 29, 2016
Merged

Beta Backports#2396
arkpar merged 4 commits into
betafrom
betabackports

Conversation

@tomusdrw
Copy link
Copy Markdown
Collaborator

tomusdrw and others added 4 commits September 29, 2016 12:09
* Removing extras data from retracted blocks.

* Adding a test case

Conflicts:
	ethcore/src/blockchain/blockchain.rs
Conflicts:
	ethcore/src/miner/transaction_queue.rs
* Prioritizing re-imported transactions

* Fixing compilation on beta

Conflicts:
	Cargo.lock
	ethcore/src/client/client.rs
	ethcore/src/miner/transaction_queue.rs
@tomusdrw tomusdrw added A8-backport 🕸 Pull request is already reviewed well in another branch. B0-patch M4-core ⛓ Core client code / Rust. labels Sep 29, 2016
@tomusdrw tomusdrw changed the title Betabackports Beta Backports Sep 29, 2016
@arkpar arkpar merged commit 63d3a4d into beta Sep 29, 2016
@arkpar arkpar deleted the betabackports branch October 3, 2016 15:35
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. M4-core ⛓ Core client code / Rust.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants