Revision 1596756

Jump to revision:
Author:	dweiss
Date:	Thu May 22 05:45:38 2014 UTC (9 years, 11 months ago)
Changed paths:	53
Log Message:	Merging with trunk.

Changed paths

Path	Details
lucene/dev/branches/lucene5650/	modified , props changed
lucene/dev/branches/lucene5650/dev-tools/	modified , props changed
lucene/dev/branches/lucene5650/lucene/	modified , props changed
lucene/dev/branches/lucene5650/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5650/lucene/codecs/	modified , props changed
lucene/dev/branches/lucene5650/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/common-build.xml	modified , props changed
lucene/dev/branches/lucene5650/lucene/core/	modified , props changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosReader.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosReader.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosReader.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java	deleted
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java, r1596755)	added
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java, r1596755)	added
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/index/TestDoc.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java, r1596755)	added
lucene/dev/branches/lucene5650/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/memory/	modified , props changed
lucene/dev/branches/lucene5650/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/misc/	modified , props changed
lucene/dev/branches/lucene5650/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java	modified , text changed
lucene/dev/branches/lucene5650/lucene/test-framework/	modified , props changed
lucene/dev/branches/lucene5650/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java	modified , text changed
lucene/dev/branches/lucene5650/solr/	modified , props changed
lucene/dev/branches/lucene5650/solr/CHANGES.txt	modified , props changed
lucene/dev/branches/lucene5650/solr/core/	modified , props changed
lucene/dev/branches/lucene5650/solr/core/src/java/org/apache/solr/search/Insanity.java	modified , text changed
lucene/dev/branches/lucene5650/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java	modified , text changed
lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java	modified , text changed
lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java	modified , text changed
lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java	modified , text changed