Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-8' 

Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
This commit is contained in:
Jan Bartel 2013-05-20 17:32:18 +10:00
parent b5f3743a22 259aac6463
commit 8ceb61992b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
View File

@ -168,7 +168,6 @@ public class MultipartFilterTest
assertTrue(response.getContent().indexOf("brown cow")>=0); assertTrue(response.getContent().indexOf("brown cow")>=0);
} }
@Test @Test
public void testEncodedPost() throws Exception public void testEncodedPost() throws Exception
{ {