Revision 922996

Jump to revision:
Author:	rmuir
Date:	Sun Mar 14 22:58:18 2010 UTC (14 years, 7 months ago)
Changed paths:	13
Log Message:	merge up to trunk rev 922991

Changed paths

Path	Details
lucene/solr/branches/solr/	modified , props changed
lucene/solr/branches/solr/CHANGES.txt	modified , text changed
lucene/solr/branches/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java	modified , text changed
lucene/solr/branches/solr/lib/commons-httpclient-3.1.jar	modified , props changed
lucene/solr/branches/solr/lib/jcl-over-slf4j-1.5.5.jar	modified , props changed
lucene/solr/branches/solr/src/common/org/apache/solr/common/	modified , props changed
lucene/solr/branches/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java	modified , props changed
lucene/solr/branches/solr/src/maven/solr-core-pom.xml.template	modified , props changed
lucene/solr/branches/solr/src/maven/solr-solrj-pom.xml.template	modified , props changed
lucene/solr/branches/solr/src/solrj/org/	modified , props changed
lucene/solr/branches/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java	modified , props changed
lucene/solr/branches/solr/src/test/org/apache/solr/client/	modified , props changed
lucene/solr/branches/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/	modified , props changed