Merge remote-tracking branch 'origin/jetty-9.2.x'

Browse Source

Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java

...

This commit is contained in:

Greg Wilkins 2015-04-20 11:55:32 +10:00

parent 6b359b942a aa3c881eec

commit ecd6a04523

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available