Andy Wilkinson cd3f951d35 Merge branch '1.4.x' into 1.5.x

2016-11-17 20:43:06 +00:00

..

src/test/java

Wait for server port to be written in a more robust manner

2016-11-17 20:41:25 +00:00

pom.xml

Merge branch '1.4.x' into 1.5.x

2016-11-17 19:28:01 +00:00