Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java tests/test-integration/src/test/resources/BIOHttp.xml tests/test-integration/src/test/resources/BIOHttps.xml tests/test-integration/src/test/resources/NIOHttp.xml tests/test-integration/src/test/resources/NIOHttps.xml		2015-04-30 10:44:44 +10:00
..
src/main/java/org/eclipse/jetty/maven/plugin	Merge remote-tracking branch 'origin/jetty-9.2.x'	2015-04-30 10:44:44 +10:00
.gitignore	adding in jetty-maven-plugin	2012-08-28 09:35:45 -05:00
pom.xml	464727 - Update Javadoc for Java 8 DocLint	2015-04-22 16:54:50 -07:00