fix bad conflict merge on CHANGES from last commit

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1441520 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-02-01 16:45:20 +00:00
parent 2274676c0d
commit f86719c116
1 changed files with 12 additions and 0 deletions

View File

@ -100,6 +100,11 @@ Bug Fixes
* SOLR-4342: Fix DataImportHandler stats to be a prper Map (hossman)
* SOLR-3967: langid.enforceSchema option checks source field instead of target field (janhoy)
* SOLR-4380: Replicate after startup option would not replicate until the
IndexWriter was lazily opened. (Mark Miller, Gregg Donovan)
Optimizations
----------------------
@ -117,6 +122,11 @@ Optimizations
* SOLR-4306: Utilize indexInfo=false when gathering core names in UI
(steffkes)
* SOLR-4284: Admin UI - make core list scrollable separate from the rest of
the UI (steffkes)
* SOLR-4364: Admin UI - Locale based number formatting (steffkes)
Other Changes
----------------------
@ -125,6 +135,8 @@ Other Changes
* SOLR-4353: Renamed example jetty context file to reduce confusion (hossman)
* SOLR-4384: Make post.jar report timing information (Upayavira via janhoy)
================== 4.1.0 ==================
Versions of Major Components