commit 652b2dd4e4825fc717cc648fc9267a1e2dccf92b

Author: Chris Douglas <cdouglas@apache.org>
Date:   Wed Dec 22 21:39:48 2010 -0800

    . Upgrade Jetty to 6.1.26 to fix long-standing JETTY-748 and
    observed deadlock from connection timeout (JETTY-1264).
    
    Conflicts:
    
    	YAHOO-CHANGES.txt
    
    +++ b/YAHOO-CHANGES.txt
    +    . Upgrade Jetty to 6.1.26 to fix long-standing JETTY-748 and
    +    observed deadlock from connection timeout (JETTY-1264). (cdouglas)
    +


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-202@1077813 13f79535-47bb-0310-9956-ffa450edef68

ivy/hadoop-core-pom-template.xml

@@ -61,12 +61,12 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.25</version>
+      <version>6.1.26</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>6.1.25</version>
+      <version>6.1.26</version>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>

ivy/libraries.properties

@@ -55,8 +55,8 @@ jsp-api.version=5.5.12
 jsp-api-2.1.version=6.1.14
 jsp-2.1.version=6.1.14
 jets3t.version=0.6.1
-jetty.version=6.1.25
-jetty-util.version=6.1.25
+jetty.version=6.1.26
+jetty-util.version=6.1.26
 junit.version=4.5
 jdiff.version=1.0.9
 json.version=1.0