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

ethminer as crate #700

Merged
merged 61 commits into from Mar 13, 2016
Merged

ethminer as crate #700

merged 61 commits into from Mar 13, 2016

Conversation

gavofyork
Copy link
Contributor

No description provided.

Tomasz Drwięga and others added 30 commits March 8, 2016 15:46
Conflicts:
	parity/main.rs
Gas price threshold for transactions
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
Conflicts:
	sync/src/lib.rs
Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs
Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs
Conflicts:
	rpc/src/v1/helpers/poll_manager.rs
	rpc/src/v1/impls/eth.rs
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
@gavofyork gavofyork added the A0-pleasereview 🤓 Pull request needs code review. label Mar 13, 2016
@gavofyork gavofyork changed the title Merge ethminer ethminer as crate Mar 13, 2016
@gavofyork
Copy link
Contributor Author

Failing on chain::tests::should_add_transactions_to_queue. @tomusdrw ?

gavofyork added a commit that referenced this pull request Mar 13, 2016
@gavofyork gavofyork merged commit 90d135e into master Mar 13, 2016
@gavofyork gavofyork deleted the merge_ethminer branch March 13, 2016 20:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants