From 6a53e4b75cf7bfae3544bc9a3afdfd7cad0faaf9 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 17 Jan 2011 17:35:00 +0000
Subject: [PATCH] SOLR-2261: merge CHANGES.txt entry

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1060019 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 2f56f6ccdca..741efb4c2a6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -642,6 +642,9 @@ Bug Fixes
   addresses "commitWithin" option on Update requests.
   (noble, hossman, and Maxim Valyanskiy)
 
+* SOLR-2261: fix velocity template layout.vm that referred to an older
+  version of jquery.  (Eric Pugh via rmuir)
+
 
 Other Changes
 ----------------------