From 57a325bf4c143a9fdd578317da05a86d5330e531 Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Mon, 20 Dec 2010 08:51:45 +0000
Subject: [PATCH] HBASE-3377 Upgrade Jetty to 6.1.26

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1051022 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt | 2 +-
 pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e46d61e141e..51f0ad4f768 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -39,7 +39,7 @@ Release 0.91.0 - Unreleased
    HBASE-3345  Coprocessors: Allow observers to completely override base
                function
    HBASE-3260  Coprocessors: Add explicit lifecycle management
-
+   HBASE-3377  Upgrade Jetty to 6.1.26
 
   NEW FEATURES
    HBASE-3287  Add option to cache blocks on hfile write and evict blocks on
diff --git a/pom.xml b/pom.xml
index 4909da18c3a..3b5296b847f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,7 +477,7 @@
     <hadoop.version>0.20-append-r1044525</hadoop.version>
     <jasper.version>5.5.23</jasper.version>
     <jaxb-api.version>2.1</jaxb-api.version>
-    <jetty.version>6.1.25</jetty.version>
+    <jetty.version>6.1.26</jetty.version>
     <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
     <jersey.version>1.4</jersey.version>
     <jruby.version>1.5.2</jruby.version>