Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-07-10 04:43:39 +0000
committerGreg Wilkins2014-07-10 04:43:39 +0000
commit5e281dd449eb153599693875ceb6d7208372d9e7 (patch)
tree2ee960586eccdf6226f3ec725abd57a053e004d7 /jetty-rewrite
parent068ec214194f62fd7aa83816978188ff8ef587dc (diff)
parent55ca09a00e54d91439224c4360780ff10f4fc649 (diff)
downloadorg.eclipse.jetty.project-5e281dd449eb153599693875ceb6d7208372d9e7.tar.gz
org.eclipse.jetty.project-5e281dd449eb153599693875ceb6d7208372d9e7.tar.xz
org.eclipse.jetty.project-5e281dd449eb153599693875ceb6d7208372d9e7.zip
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts: jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
Diffstat (limited to 'jetty-rewrite')
-rw-r--r--jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java
index eea013eee3..f20e9142c7 100644
--- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java
+++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java
@@ -27,7 +27,6 @@ import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.util.ArrayUtil;
import org.eclipse.jetty.util.URIUtil;
-import org.eclipse.jetty.util.UrlEncoded;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;

Back to the top