From fadeefa71f6d94865251a95f0f4e0f5b0045377f Mon Sep 17 00:00:00 2001
From: "Chris M. Hostetter" <hossman@apache.org>
Date: Thu, 28 Jul 2011 18:16:37 +0000
Subject: [PATCH] SOLR-2629: merges CHANGES.txt from 3x r1151947

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151952 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3cb6c0ceb59..4ab764fa1cb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -398,6 +398,9 @@ Bug Fixes
  Other Changes
 ----------------------
 
+* SOLR-2629: Eliminate deprecation warnings in some JSPs.
+  (Bernd Fehling, hossman)
+
 Build
 ----------------------