Revision 1627806

Jump to revision:
Author:	rmuir
Date:	Fri Sep 26 15:20:36 2014 UTC (10 years ago)
Changed paths:	24
Log Message:	merge trunk

Changed paths

Path	Details
lucene/dev/branches/lucene5969/	modified , props changed
lucene/dev/branches/lucene5969/lucene/	modified , props changed
lucene/dev/branches/lucene5969/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5969/lucene/core/	modified , props changed
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java, r1627805)	added
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java, r1627805)	added
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/QueryTimeoutImpl.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/QueryTimeoutImpl.java, r1627805)	added
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java	modified , text changed
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java, r1627805)	added
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java	modified , text changed
lucene/dev/branches/lucene5969/solr/	modified , props changed
lucene/dev/branches/lucene5969/solr/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene5969/solr/core/	modified , props changed
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java	modified , text changed
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java	modified , text changed
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java	modified , text changed
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java	modified , text changed
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/search/SolrQueryTimeoutImpl.java (Copied from lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrQueryTimeoutImpl.java, r1627805)	added
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java	modified , text changed
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/TestGroupingSearch.java	modified , text changed
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java, r1627805)	added
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java (Copied from lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java, r1627805)	added
lucene/dev/branches/lucene5969/solr/solrj/	modified , props changed
lucene/dev/branches/lucene5969/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java	modified , text changed