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

fixed master #6465

Merged
merged 3 commits into from
Sep 5, 2017
Merged

fixed master #6465

merged 3 commits into from
Sep 5, 2017

Conversation

debris
Copy link
Collaborator

@debris debris commented Sep 5, 2017 •
edited
Loading

bug introduced in #6459, cause we have merged 2 exclusive prs at the same time

@debris debris added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Sep 5, 2017
@tomusdrw tomusdrw added A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. and removed A0-pleasereview 🤓 Pull request needs code review. labels Sep 5, 2017
tomusdrw
tomusdrw approved these changes Sep 5, 2017
View reviewed changes
Copy link
Collaborator

@tomusdrw tomusdrw left a comment

Choose a reason for hiding this comment

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

lgtm, although the build is still failing.

@debris
Copy link
Collaborator Author

debris commented Sep 5, 2017

temporarily reverted #6370 (as discussed with @arkpar). The pr should be revisited once it's compatible with master

@debris debris added A0-pleasereview 🤓 Pull request needs code review. and removed A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. labels Sep 5, 2017
@debris debris requested a review from arkpar September 5, 2017 12:04
@arkpar arkpar merged commit 899538a into master Sep 5, 2017
@arkpar arkpar deleted the fix_master branch September 5, 2017 12:53
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Sep 5, 2017
rphmeier added a commit that referenced this pull request Sep 5, 2017
@rphmeier
Revert "fixed master (#6465)"
ad39446 
This reverts commit 899538a.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tomusdrw tomusdrw tomusdrw approved these changes

@arkpar arkpar Awaiting requested review from arkpar

Assignees
No one assigned
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@debris @tomusdrw @arkpar