Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix mysql test error because of PR merges #261

Merged
merged 1 commit into from
Jan 23, 2017

Conversation

DylannCordel
Copy link
Contributor

@DylannCordel DylannCordel commented Jan 23, 2017

There was a merged PR (#197) with some read-tracking modifications which needed a little adjustment to work with another merged PR (#258)

This PR fixes this conflict.

@DylannCordel
Copy link
Contributor Author

@lampslave could you merge this one quickly to avoid travis's invalid failures for newer PR please ? Thanks for recent merges. When you have multiple PR from @skolsuper and me to merge, I can merge all of those into a single PR if you want. It will be simpler to you to merge all the stuff without having to find and fix conflicts / required adjustments if you have not time for that at this moment.

I know it's time-consuming to keep an open-source project, so if I can help you spend less time with my own PR, it's okay ! :)

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 93.244% when pulling 5f9bfa1 on webu:fix/mysql-tests into feb5ee4 on hovel:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 93.244% when pulling 5f9bfa1 on webu:fix/mysql-tests into feb5ee4 on hovel:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 93.244% when pulling 5f9bfa1 on webu:fix/mysql-tests into feb5ee4 on hovel:master.

@lampslave lampslave merged commit 854ecd0 into hovel:master Jan 23, 2017
@lampslave
Copy link
Contributor

I wanted to ask you to check code after last merges, but you did it first :)

I can merge all of those into a single PR if you want

It will be great, but only for checked and acceped (in comments) PRs.

@DylannCordel DylannCordel deleted the fix/mysql-tests branch January 23, 2017 14:09
@DylannCordel
Copy link
Contributor Author

It will be great, but only for checked and acceped (in comments) PRs.

@lampslave yes of course. You just have to "cite" me in one of concerned/accepted PR and list all other concerned/accepted PR I'll have to merge into a unique PR.

Thanks for your quick merge :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants