| commit | 50a67eac6ad1742bdd695d6a0a8ac22f8ad362ac | [log] [tgz] |
|---|---|---|
| author | Jan Bartel <janb@intalio.com> | Thu Jul 25 13:22:14 2013 +1000 |
| committer | Jan Bartel <janb@intalio.com> | Thu Jul 25 13:22:14 2013 +1000 |
| tree | 6471259befbeb667374044562de06ab1ad8ca44e | |
| parent | 86e8cf7b299778ad7fdf6aaa68a49f4ff56effcd [diff] | |
| parent | 72b077921dbdd27d0f8cd0833bbc2818265e74f2 [diff] |
Merge remote-tracking branch 'origin/jetty-8' Conflicts: jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
