Revision 919455

Jump to revision:
Author:	markrmiller
Date:	Fri Mar 5 15:46:52 2010 UTC (14 years, 2 months ago)
Changed paths:	12
Log Message:	merge up to r919444

Changed paths

Path	Details
lucene/solr/branches/cloud/	modified , props changed
lucene/solr/branches/cloud/CHANGES.txt	modified , text changed
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java	modified , text changed
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/SystemInfoRequestHandler.java (Copied from lucene/solr/trunk/src/java/org/apache/solr/handler/SystemInfoRequestHandler.java, r919444)	added
lucene/solr/branches/cloud/src/java/org/apache/solr/search/DisMaxQParser.java	modified , text changed
lucene/solr/branches/cloud/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java	modified , text changed
lucene/solr/branches/cloud/src/java/org/apache/solr/search/QueryParsing.java	modified , text changed
lucene/solr/branches/cloud/src/java/org/apache/solr/util/TestHarness.java	modified , text changed
lucene/solr/branches/cloud/src/test/org/apache/solr/DisMaxRequestHandlerTest.java	modified , text changed
lucene/solr/branches/cloud/src/test/org/apache/solr/search/QueryParsingTest.java	modified , text changed
lucene/solr/branches/cloud/src/test/org/apache/solr/search/TestExtendedDismaxParser.java	modified , text changed
lucene/solr/branches/cloud/src/test/test-files/solr/conf/solrconfig.xml	modified , text changed