{"push_id":1181328194,"size":185,"distinct_size":2,"ref":"refs/heads/master","head":"42f067e49fc9d2e0f9b034be7256ecf8e41960cc","before":"c1e3a7d2d0c11579c8f05092a738155e96bb3128","commits":[{"sha":"50051d9d3a6ee69d028ad21e03841a0af23f5db4","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Migrated to Jetty 9. Fault behaviour does not work - failing tests.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/50051d9d3a6ee69d028ad21e03841a0af23f5db4"},{"sha":"87c9dd72f5b5e0e093047d76dbb78f284889fca7","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Merge branch 'master' into jetty9\n\nConflicts:\n\tsrc/main/java/com/github/tomakehurst/wiremock/core/Options.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/87c9dd72f5b5e0e093047d76dbb78f284889fca7"},{"sha":"f6c7eebb5de8ab3e24826581a1742079fa91e4f9","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Fixed compilation broken by merge with master","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/f6c7eebb5de8ab3e24826581a1742079fa91e4f9"},{"sha":"733cec4dd2d097bd1afe6cbab1fe3e19d12846d6","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Merge branch 'master' into jetty9\n\nConflicts:\n\tbuild.gradle","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/733cec4dd2d097bd1afe6cbab1fe3e19d12846d6"},{"sha":"be2d27275a1cb31cf6c8626687b9da791d153471","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Fixed merge on build.gradle","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/be2d27275a1cb31cf6c8626687b9da791d153471"},{"sha":"85198eb4a385dc8921d992dce0a7b128ccf6392c","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Merge branch 'master' into jetty9","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/85198eb4a385dc8921d992dce0a7b128ccf6392c"},{"sha":"e941d8053be8b27970ceda934f964a0eb81ccd12","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Added faults to Jetty 9 - delay before accepting connection and closes connection before sending response.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/e941d8053be8b27970ceda934f964a0eb81ccd12"},{"sha":"6ee2f0b6a98339b26143363c1b1cd84343bd83f4","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Merge branch 'master' into jetty9\n\nConflicts:\n\tbuild.gradle\n\tsrc/main/java/com/github/tomakehurst/wiremock/WireMockServer.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/http/Response.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty/JettyHttpServer.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty/JettyHttpServerFactory.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty6/DelayableSocketConnector.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty6/DelayableSslSocketConnector.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty6/Jetty6HttpServer.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty6/Jetty6HttpServerFactory.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServerFactory.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/6ee2f0b6a98339b26143363c1b1cd84343bd83f4"},{"sha":"a919b0a28d500b507c9b39930177e52a9548eb42","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Reinstating fault logic lost in the merge.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/a919b0a28d500b507c9b39930177e52a9548eb42"},{"sha":"c12a6c0905804c1a646fec5e7afd379935133557","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Reinstating fault logic lost in the merge.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/c12a6c0905804c1a646fec5e7afd379935133557"},{"sha":"3e2a8fa3c4627435574596a4b6f24b823361e78d","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Putting HandlerDispatchingServlet back in jetty specific package as it depends on the jetty specific request adapter.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/3e2a8fa3c4627435574596a4b6f24b823361e78d"},{"sha":"72b49ad5ea629cdb5e35fd60a5e865596ff5011b","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Merge branch 'master' into jetty9\n\nConflicts:\n\tsrc/main/java/com/github/tomakehurst/wiremock/WireMockServer.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/core/Options.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty6/DelayableSslSocketConnector.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java\n\tsrc/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java\n\tsrc/test/java/com/github/tomakehurst/wiremock/WarDeploymentDifferentMappingAcceptanceTest.java","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/72b49ad5ea629cdb5e35fd60a5e865596ff5011b"},{"sha":"0eafdf87b11fda24ad804817399d09d3be2d1d97","author":{"name":"Robert Elliot","email":"250ddf768181782bd7ec5f89baf25f1862c7216e@lidalia.org.uk"},"message":"Deleting accidentally committed test","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/0eafdf87b11fda24ad804817399d09d3be2d1d97"},{"sha":"f8f16c4b171d5785f4478538a146d835d7c67400","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"Merge branch 'jetty9' of github.com:Mahoney/wiremock into rob-jetty-refactor","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/f8f16c4b171d5785f4478538a146d835d7c67400"},{"sha":"6090b00c88b53dbed412f7cc53b35dfbfa039b45","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"Making some progress fixing fault injection","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/6090b00c88b53dbed412f7cc53b35dfbfa039b45"},{"sha":"46d00f5a3debc7b2941da3b5566fd48fb967d16f","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"WIP","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/46d00f5a3debc7b2941da3b5566fd48fb967d16f"},{"sha":"0750c1f87e6f6336e380a4090e37397a72d0601f","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"Merge branch 'master' into rob-jetty-refactor","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/0750c1f87e6f6336e380a4090e37397a72d0601f"},{"sha":"1b6dc573d4cfa884558b6e8a8628929680c894a4","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"Got HTTPS faults working","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/1b6dc573d4cfa884558b6e8a8628929680c894a4"},{"sha":"c1e40d51d7e5bd131dd4f8974cbb5a97fba2f5f4","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"Made HttpAcceptanceTest.rejectWithoutClientCertificate accept SocketException or SSLHandshakeException as these are both thrown depending on platform.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/c1e40d51d7e5bd131dd4f8974cbb5a97fba2f5f4"},{"sha":"ca2f5d3999fae4adbb85b268a180ccc1b6312326","author":{"name":"Tom Akehurst","email":"b5be37801010b83517235c2fd61fe02fa12b8cd3@googlemail.com"},"message":"Removing jdk6 from the Travis file again. Duh.","distinct":false,"url":"https://api.github.com/repos/tomakehurst/wiremock/commits/ca2f5d3999fae4adbb85b268a180ccc1b6312326"}]}
{"actor":{"display_login":"tomakehurst"}}