From ed604b2fbf95c8938b109ccb0e0340c550302d73 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 11 Sep 2010 15:47:01 +0000
Subject: [PATCH] Update changelog

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@996159 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57ee7c336..1b43935ab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -131,6 +131,10 @@
         <bug>49892</bug>: Correct JNDI name for method resource injections.
         Based on a patch by Gurkan Erdogdu. (markt)
       </fix>
+      <fix>
+        Ensure that Context elements defined in server.xml use any configClass
+        setting specified in the parent Host element. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0