Revision 1211591

Jump to revision:
Author:	uschindler
Date:	Wed Dec 7 18:49:18 2011 UTC (12 years, 9 months ago)
Changed paths:	17
Log Message:	Merge to trunk r1211584

Changed paths

Path	Details
lucene/dev/branches/lucene3606/	modified , props changed
lucene/dev/branches/lucene3606/dev-tools/maven/lucene/contrib/misc/pom.xml.template	modified , text changed
lucene/dev/branches/lucene3606/lucene/	modified , props changed
lucene/dev/branches/lucene3606/lucene/CHANGES.txt	modified , text changed
lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentMerger.java	modified , text changed
lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java	modified , text changed
lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/values/IndexDocValues.java	modified , text changed
lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java	modified , text changed
lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java	modified , text changed
lucene/dev/branches/lucene3606/solr/	modified , props changed
lucene/dev/branches/lucene3606/solr/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene3606/solr/core/	modified , props changed
lucene/dev/branches/lucene3606/solr/core/src/java/	modified , props changed
lucene/dev/branches/lucene3606/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java	modified , text changed
lucene/dev/branches/lucene3606/solr/core/src/test/	modified , props changed
lucene/dev/branches/lucene3606/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java	modified , text changed
lucene/dev/branches/lucene3606/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java	modified , text changed