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

Merge to master and start hypervisor for import/export #1138

Merged
merged 8 commits into from
May 25, 2016

Conversation

gavofyork
Copy link
Contributor

No description provided.

arkpar and others added 6 commits May 24, 2016 21:56
* Fix --geth IPC for MacOS.

* fix pending_* methods in MinerService, add pending_receipts

* pending logs

* include pending logs when polling

* fixed returning pending logs multiple timees

* log type

* transactionHash is supplied to pending logs

* miner returns receipts together with hashes

* bring back miners all_transactions used by sync module
* simple db migration

* make migration slightly more functional

* migration version is just a single unsigned integer
* Display progress when importing

* Additional polish.

* Fix strange yielding behaviour.

* Allow colour to be disabled.

Fixed #1135
@gavofyork gavofyork added the A0-pleasereview 🤓 Pull request needs code review. label May 25, 2016
@NikVolf
Copy link
Contributor

NikVolf commented May 25, 2016

@gavofyork you want it merge it all together with #1115 ?

@gavofyork
Copy link
Contributor Author

yup - just put it in there. it's a fix to make it work.

@NikVolf NikVolf merged commit 878851d into db-ipc-cont May 25, 2016
@gavofyork gavofyork deleted the db-ipc-cont-imexport branch June 1, 2016 18:04
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants