Commit Graph

203 Commits

Author SHA1 Message Date
Jan Bartel c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
2012-11-30 15:45:36 +11:00
Greg Wilkins 4d823c28bf jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref 2012-11-29 17:41:54 +11:00
Jesse McConnell 97640eeea0 [Bug 394143] add jetty-all aggregate via release profile 2012-11-12 17:13:06 -06:00