Revision 1595228

Jump to revision:
Author:	rmuir
Date:	Fri May 16 15:04:20 2014 UTC (10 years, 5 months ago)
Changed paths:	43
Log Message:	LUCENE-5666: merge trunk

Changed paths

Path	Details
lucene/dev/branches/lucene5666/	modified , props changed
lucene/dev/branches/lucene5666/lucene/	modified , props changed
lucene/dev/branches/lucene5666/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5666/lucene/analysis/	modified , props changed
lucene/dev/branches/lucene5666/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/benchmark/	modified , props changed
lucene/dev/branches/lucene5666/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/codecs/	modified , props changed
lucene/dev/branches/lucene5666/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/	modified , props changed
lucene/dev/branches/lucene5666/lucene/core/src/java/org/apache/lucene/index/CorruptIndexException.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/java/org/apache/lucene/store/Lock.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/java/org/apache/lucene/store/LockObtainFailedException.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java	modified , text changed
lucene/dev/branches/lucene5666/lucene/core/src/test/org/apache/lucene/index/dvupdates.48.zip (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/dvupdates.48.zip, r1595227)	added
lucene/dev/branches/lucene5666/lucene/ivy-versions.properties	modified , text changed , props changed
lucene/dev/branches/lucene5666/lucene/licenses/	modified , props changed
lucene/dev/branches/lucene5666/lucene/licenses/icu4j-52.1.jar.sha1	deleted
lucene/dev/branches/lucene5666/lucene/licenses/icu4j-53.1.jar.sha1 (Copied from lucene/dev/trunk/lucene/licenses/icu4j-53.1.jar.sha1, r1595227)	added
lucene/dev/branches/lucene5666/solr/	modified , props changed
lucene/dev/branches/lucene5666/solr/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5666/solr/core/	modified , props changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java (Copied from lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java, r1595227)	added
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/search/RankQuery.java (Copied from lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/RankQuery.java, r1595227)	added
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java	modified , text changed
lucene/dev/branches/lucene5666/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java, r1595227)	added
lucene/dev/branches/lucene5666/solr/core/src/test/org/apache/solr/search/RankQueryTest.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/RankQueryTest.java, r1595227)	added
lucene/dev/branches/lucene5666/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java, r1595227)	added , text changed
lucene/dev/branches/lucene5666/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml (Copied from lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml, r1595227)	added
lucene/dev/branches/lucene5666/solr/licenses/	modified , props changed
lucene/dev/branches/lucene5666/solr/licenses/icu4j-52.1.jar.sha1	deleted
lucene/dev/branches/lucene5666/solr/licenses/icu4j-53.1.jar.sha1 (Copied from lucene/dev/trunk/solr/licenses/icu4j-53.1.jar.sha1, r1595227)	added