You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/30 19:50:43 UTC
svn commit: r1307554 - in /lucene/dev/branches/lucene3930: ./ lucene/ solr/
solr/CHANGES.txt solr/solrj/
solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
Author: rmuir
Date: Fri Mar 30 17:50:43 2012
New Revision: 1307554
URL: http://svn.apache.org/viewvc?rev=1307554&view=rev
Log:
LUCENE-3930: merge trunk (1307383:1307552)
Modified:
lucene/dev/branches/lucene3930/ (props changed)
lucene/dev/branches/lucene3930/lucene/ (props changed)
lucene/dev/branches/lucene3930/solr/ (props changed)
lucene/dev/branches/lucene3930/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3930/solr/solrj/ (props changed)
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
Modified: lucene/dev/branches/lucene3930/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/CHANGES.txt?rev=1307554&r1=1307553&r2=1307554&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3930/solr/CHANGES.txt Fri Mar 30 17:50:43 2012
@@ -65,8 +65,12 @@ Upgrading from Solr 3.6-dev
* The update request parameter to choose Update Request Processor Chain is
renamed from "update.processor" to "update.chain". The old parameter was
- deprecated but still working since Solr3.2, but is now removed entirely.
+ deprecated but still working since Solr3.2, but is now removed
+ entirely.
+* Two of the SolrServer subclasses in SolrJ were renamed/replaced.
+ CommonsHttpSolrServer is now HttpSolrServer, and
+ StreamingUpdateSolrServer is now ConcurrentUpdateSolrServer.
Detailed Change List
----------------------
Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1307554&r1=1307553&r2=1307554&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Fri Mar 30 17:50:43 2012
@@ -37,7 +37,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.*;
/**
- * LBHttpSolrServer or "LoadBalanced HttpSolrServer" is a load balancing wrapper to CommonsHttpSolrServer. This is useful when you
+ * LBHttpSolrServer or "LoadBalanced HttpSolrServer" is a load balancing wrapper around
+ * {@link org.apache.solr.client.solrj.impl.HttpSolrServer}. This is useful when you
* have multiple SolrServers and the requests need to be Load Balanced among them. This should <b>NOT</b> be used for
* indexing. Also see the <a href="http://wiki.apache.org/solr/LBHttpSolrServer">wiki</a> page.
* <p/>