Google Git
Sign in
eclipse/jetty/org.eclipse.jetty.project/50a67eac6ad1742bdd695d6a0a8ac22f8ad362ac
commit
50a67eac6ad1742bdd695d6a0a8ac22f8ad362ac
[log]
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
tree: 6471259befbeb667374044562de06ab1ad8ca44e
  1. aggregates/
  2. dists/
  3. examples/
  4. jetty-annotations/
  5. jetty-ant/
  6. jetty-client/
  7. jetty-continuation/
  8. jetty-deploy/
  9. jetty-distribution/
  10. jetty-http/
  11. jetty-http-spi/
  12. jetty-io/
  13. jetty-jaas/
  14. jetty-jaspi/
  15. jetty-jmx/
  16. jetty-jndi/
  17. jetty-jsp/
  18. jetty-jspc-maven-plugin/
  19. jetty-maven-plugin/
  20. jetty-monitor/
  21. jetty-nosql/
  22. jetty-osgi/
  23. jetty-overlay-deployer/
  24. jetty-plus/
  25. jetty-proxy/
  26. jetty-rewrite/
  27. jetty-rhttp/
  28. jetty-runner/
  29. jetty-security/
  30. jetty-server/
  31. jetty-servlet/
  32. jetty-servlets/
  33. jetty-spdy/
  34. jetty-spring/
  35. jetty-start/
  36. jetty-util/
  37. jetty-util-ajax/
  38. jetty-webapp/
  39. jetty-websocket/
  40. jetty-xml/
  41. LICENSE-CONTRIBUTOR/
  42. tests/
  43. .gitignore
  44. header-template.txt
  45. icon.jpg
  46. LICENSE-eplv10-aslv20.html
  47. NOTICE.txt
  48. pom.xml
  49. README.txt
  50. settings.xml
  51. VERSION.txt