Revision 1575397

Jump to revision:
Author:	mikemccand
Date:	Fri Mar 7 20:50:45 2014 UTC (10 years, 7 months ago)
Changed paths:	105 (showing only 100; show all)
Log Message:	LUCENE-5487: merge trunk

Changed paths

Path	Details
lucene/dev/branches/lucene5487/	modified , props changed
lucene/dev/branches/lucene5487/dev-tools/	modified , props changed
lucene/dev/branches/lucene5487/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml	modified , text changed
lucene/dev/branches/lucene5487/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml	modified , text changed
lucene/dev/branches/lucene5487/dev-tools/scripts/checkJavaDocs.py	modified , text changed
lucene/dev/branches/lucene5487/dev-tools/scripts/smokeTestRelease.py	modified , text changed
lucene/dev/branches/lucene5487/lucene/	modified , props changed
lucene/dev/branches/lucene5487/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5487/lucene/analysis/	modified , props changed
lucene/dev/branches/lucene5487/lucene/analysis/common/	modified , props changed
lucene/dev/branches/lucene5487/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries2.java (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries2.java, r1575347)	added
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestConv.java (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestConv.java, r1575347)	added
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestIgnore.java (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestIgnore.java, r1575347)	added
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/conv.aff (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/conv.aff, r1575347)	added
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/conv.dic (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/conv.dic, r1575347)	added
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/ignore.aff (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/ignore.aff, r1575347)	added
lucene/dev/branches/lucene5487/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/ignore.dic (Copied from lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/ignore.dic, r1575347)	added
lucene/dev/branches/lucene5487/lucene/core/	modified , props changed
lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/index/DocInverterPerField.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/search/Sort.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java, r1575347)	added
lucene/dev/branches/lucene5487/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/	modified , props changed
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinComparatorSource.java (Copied from lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinComparatorSource.java, r1575347)	added
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/BlockJoinSorter.java	deleted
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/EarlyTerminatingSortingCollector.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/NumericDocValuesSorter.java	deleted
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/Sorter.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingMergePolicy.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/java/org/apache/lucene/index/sorter/package.html	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/test/org/apache/lucene/index/sorter/SortingAtomicReaderTest.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/suggest/	modified , props changed
lucene/dev/branches/lucene5487/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java	modified , text changed
lucene/dev/branches/lucene5487/lucene/test-framework/	modified , props changed
lucene/dev/branches/lucene5487/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java	modified , text changed
lucene/dev/branches/lucene5487/solr/	modified , props changed
lucene/dev/branches/lucene5487/solr/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5487/solr/core/	modified , props changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/cloud/Overseer.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/cloud/ZkController.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/core/ConfigSolr.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/core/ZkContainer.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingInfixLookupFactory.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/spelling/suggest/fst/BlendedInfixLookupFactory.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheKey.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheLocation.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectoryCache.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BlockLocks.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/BufferStore.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/Cache.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/blockcache/Store.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/java/org/apache/solr/store/hdfs/NullIndexOutput.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java, r1575347)	added
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/core/TestNonNRTOpen.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/schema/WrappedIntField.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/WrappedIntField.java, r1575347)	added
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java, r1575347)	added
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java, r1575347)	added
lucene/dev/branches/lucene5487/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml (Copied from lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml, r1575347)	added
lucene/dev/branches/lucene5487/solr/core/src/test-files/solr/collection1/conf/schema11.xml	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml	modified , text changed
lucene/dev/branches/lucene5487/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml	modified , text changed
lucene/dev/branches/lucene5487/solr/example/	modified , props changed
lucene/dev/branches/lucene5487/solr/example/solr/collection1/conf/solrconfig.xml	modified , text changed
[...]