fixed context issues
Merge branch 'master' of github.com:vert-x/vert.x
Cancel timer after response is written to prevent IllegalStateException
make sure websocket client connect is executed on correct context
Merge branch 'master' of github.com:vert-x/vert.x
Netty 4.0.0.Beta3 was released
initial round of changes to http api
api refactoring
Revert "api refactoring"

This reverts commit 28a74bfce49b5bea38212c6173363262c3bf21ce.
Revert "initial round of changes to http api"

This reverts commit f87e0f048052e7cbff64d703a1e498806b4b5963.
Upgrade to Netty 4.0.0.CR1
[#543] Fix IllegalStateException while using HttpResponse.end(..) from outside the EventLoop of Netty
[#543] Fix IllegalStateException while using HttpResponse.end(..) from outside the EventLoop of Netty
Make the server bind in an async fashion
Add workaround for async listen behavior in the tests
Add another workaround for async listen behavior in the tests
Wait for the server to complete listen
Wait for the server to complete listen
Use the same EventLoopGroup for clients and servers
Make the api more consistent