Revision 1643662

Jump to revision:
Author:	mikemccand
Date:	Sun Dec 7 11:37:32 2014 UTC (9 years, 4 months ago)
Changed paths:	197 (showing only 100; show all)
Log Message:	LUCENE-6005: merge trunk

Changed paths

Path	Details
lucene/dev/branches/lucene6005/	modified , props changed
lucene/dev/branches/lucene6005/lucene/	modified , props changed
lucene/dev/branches/lucene6005/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene6005/lucene/codecs/	modified , props changed
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/	modified , props changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50Codec.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50StoredFieldsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/AbortingException.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/AbortingException.java, r1643659)	added
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/CorruptIndexException.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocConsumer.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/OutputStreamIndexOutput.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java, r1643659)	added , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDoc.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterAbort.java	deleted
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/mockfile/TestMockFilesystems.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilterCachingPolicy.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilterCachingPolicy.java, r1643659)	added , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java, r1643659)	added , text changed
lucene/dev/branches/lucene6005/lucene/facet/	modified , props changed
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/highlighter/	modified , props changed
lucene/dev/branches/lucene6005/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TermVectorLeafReader.java (Copied from lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TermVectorLeafReader.java, r1643659)	added
lucene/dev/branches/lucene6005/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/memory/	modified , props changed
lucene/dev/branches/lucene6005/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndexNormDocValues.java	deleted
lucene/dev/branches/lucene6005/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/misc/	modified , props changed
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/queries/	modified , props changed
lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/sandbox/	modified , props changed
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/spatial/	modified , props changed
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/	modified , props changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java	modified , text changed
[...]