jetty.project/jetty-deploy
Greg Wilkins 06d3fbe5aa Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
2013-06-11 14:07:00 +10:00
..
src Merge remote-tracking branch 'origin/jetty-8' 2013-06-11 14:07:00 +10:00
pom.xml Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00