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

Error on tests with both promise and callback #718

Merged
merged 1 commit into from Jun 13, 2017
Merged

Error on tests with both promise and callback #718

merged 1 commit into from Jun 13, 2017

Conversation

@geek
Copy link
Member

geek commented Jun 13, 2017

Fixes #580

@geek geek added this to the 14.0.0 milestone Jun 13, 2017
@geek geek self-assigned this Jun 13, 2017
@geek geek requested a review from Marsup Jun 13, 2017
@geek geek added bug and removed feature labels Jun 13, 2017
@geek geek requested review from cjihrig and arb and removed request for Marsup and cjihrig Jun 13, 2017
@arb
arb approved these changes Jun 13, 2017
Copy link
Contributor

arb left a comment

LGtM

@geek geek merged commit 607145d into hapijs:master Jun 13, 2017
2 checks passed
2 checks passed
Node Security No known vulnerabilities found
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.