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

Tx_queue_docs -> To master #651

Merged
merged 5 commits into from
Mar 10, 2016
Merged

Tx_queue_docs -> To master #651

merged 5 commits into from
Mar 10, 2016

Conversation

tomusdrw
Copy link
Collaborator

#631 was merge to tx_queue_integration. It should go to master

@tomusdrw tomusdrw added the A0-pleasereview 🤓 Pull request needs code review. label Mar 10, 2016
@tomusdrw tomusdrw mentioned this pull request Mar 10, 2016
@gavofyork
Copy link
Contributor

didn't i just merge this?

@gavofyork gavofyork added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 10, 2016
Conflicts:
	sync/src/transaction_queue.rs
@tomusdrw
Copy link
Collaborator Author

Yeah, sorry. The merge was to different branch (not master) to review only relevant changes, but I haven't stated that prs should be merged in particular order.

@tomusdrw tomusdrw added A0-pleasereview 🤓 Pull request needs code review. A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. A0-pleasereview 🤓 Pull request needs code review. labels Mar 10, 2016
gavofyork added a commit that referenced this pull request Mar 10, 2016
@gavofyork gavofyork merged commit f708d36 into master Mar 10, 2016
@gavofyork gavofyork deleted the tx_queue_integration branch March 10, 2016 12:19
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.

2 participants