mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-19 13:06:06 +00:00
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