Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-05-20 03:32:18 -0400
committerJan Bartel2013-05-20 03:32:18 -0400
commit8ceb61992bb0d480defd7eebc2161a77c9b8c7e7 (patch)
treeb3e8befff57452711cda4148598cc9ccdb1d7060 /jetty-servlets/src
parentb5f3743a226ce029c267ecfd0cc2c463140ce54a (diff)
parent259aac6463d0b3272fae78b4a7f20912d2843103 (diff)
downloadorg.eclipse.jetty.project-8ceb61992bb0d480defd7eebc2161a77c9b8c7e7.tar.gz
org.eclipse.jetty.project-8ceb61992bb0d480defd7eebc2161a77c9b8c7e7.tar.xz
org.eclipse.jetty.project-8ceb61992bb0d480defd7eebc2161a77c9b8c7e7.zip
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
Diffstat (limited to 'jetty-servlets/src')
-rw-r--r--jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
index 6385551598..de080233ec 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
@@ -168,7 +168,6 @@ public class MultipartFilterTest
assertTrue(response.getContent().indexOf("brown cow")>=0);
}
-
@Test
public void testEncodedPost() throws Exception
{

Back to the top