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(web-server): implement a timeout on webServer.close() #973

Merged
merged 1 commit into from
Apr 1, 2014

Conversation

sylvain-hamel
Copy link
Contributor

Closes #952

@dignifiedquire
Copy link
Member

Looks good to me, but for some reason you have two commits with the same messages.

@sylvain-hamel
Copy link
Contributor Author

I'm sorry about that. These two commits should be squashed. I fixed some spacing in the second commit. Do I have do squash them now or will you squash them when you'll merge the PR?

@dignifiedquire
Copy link
Member

Better squash them yourself, so you can be certain it did what you intended. Easiest way is
git rebase -i HEAD~2 and then in the editor choose pick for the first and fixup for the second commit. After that just do a force push to this branch and all should be good.

@sylvain-hamel
Copy link
Contributor Author

Done. Thanks for the help on how to do this.

@dignifiedquire
Copy link
Member

👍

@sylvain-hamel
Copy link
Contributor Author

@dignifiedquire does your "thumbs up" mean "go ahead, merge it"?

@dignifiedquire
Copy link
Member

@sylvain-hamel yes

sylvain-hamel added a commit that referenced this pull request Apr 1, 2014
fix(web-server): implement a timeout on webServer.close()
@sylvain-hamel sylvain-hamel merged commit 43c6496 into karma-runner:master Apr 1, 2014
@sylvain-hamel sylvain-hamel deleted the fix-952 branch April 19, 2014 03:52
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.

Karma 0.12 hangs with and IE11
2 participants