Andy Wilkinson 9c88ba3b90 Merge branch '1.5.x'

2017-03-02 17:30:44 +00:00

..

main

Merge branch '1.5.x'

2017-03-02 17:30:44 +00:00

test/java/org/springframework/boot

Rename EmbeddedServletContainer -> EmbeddedWebServer

2017-02-06 17:44:26 +01:00