jetty.project/jetty-deploy/src/test
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
..
java/org/eclipse/jetty/deploy Merge remote-tracking branch 'origin/jetty-8' 2013-06-11 14:07:00 +10:00
resources Updating Jetty XML use in jetty-deploy tests. 2013-06-03 11:34:38 -07:00