You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2010/05/30 06:10:14 UTC
svn commit: r949467 - in /lucene/solr/branches/branch-1.4: ./ lib/
src/common/org/apache/solr/common/ src/common/org/apache/solr/common/util/
src/java/org/apache/solr/search/function/ src/maven/ src/solrj/org/
src/solrj/org/apache/solr/client/solrj/imp...
Author: hossman
Date: Sun May 30 04:10:13 2010
New Revision: 949467
URL: http://svn.apache.org/viewvc?rev=949467&view=rev
Log:
merging r881642 from solr/branches/branch-1.5-dev for SOLR-1432 ... this is also causing some blank svn:merginfo props (probably from an old WC->WC copy) to be cleaned up
Modified:
lucene/solr/branches/branch-1.4/ (props changed)
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/lib/commons-httpclient-3.1.jar (props changed)
lucene/solr/branches/branch-1.4/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/solr/branches/branch-1.4/src/common/org/apache/solr/common/ (props changed)
lucene/solr/branches/branch-1.4/src/common/org/apache/solr/common/util/JavaBinCodec.java (props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/function/ValueSource.java
lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template (props changed)
lucene/solr/branches/branch-1.4/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/solr/branches/branch-1.4/src/solrj/org/ (props changed)
lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java (props changed)
lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/ (props changed)
lucene/solr/branches/branch-1.4/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/solr/trunk:881642
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949467&r1=949466&r2=949467&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Sun May 30 04:10:13 2010
@@ -22,6 +22,39 @@ See the tutorial at http://lucene.apache
$Id$
+================== Release 1.4.1 ==================
+Release Date: See http://lucene.apache.org/solr for the official release date.
+
+Upgrading from Solr 1.4
+-----------------------
+
+This is a bug fix release no changes should be needed when upgrading
+from Solr 1.4.
+
+Versions of Major Components
+----------------------------
+Apache Lucene 2.9.1 (r832363 on 2.9 branch)
+Apache Tika 0.4
+Carrot2 3.1.0
+
+Lucene Information
+----------------
+
+Since Solr is built on top of Lucene, many people add customizations to Solr
+that are dependent on Lucene. Please see http://lucene.apache.org/java/2_9_0/,
+especially http://lucene.apache.org/java/2_9_0/changes/Changes.html for more
+information on the version of Lucene used in Solr.
+
+Bug Fixes
+----------------------
+
+* SOLR-1432: Make the new ValueSource.getValues(context,reader) delegate
+ to the original ValueSource.getValues(reader) so custom sources
+ will work. (yonik)
+
+
+
+
================== Release 1.4.0 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Propchange: lucene/solr/branches/branch-1.4/lib/commons-httpclient-3.1.jar
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/lib/jcl-over-slf4j-1.5.5.jar
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/common/org/apache/solr/common/
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/common/org/apache/solr/common/util/JavaBinCodec.java
('svn:mergeinfo' removed)
Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/function/ValueSource.java?rev=949467&r1=949466&r2=949467&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/function/ValueSource.java Sun May 30 04:10:13 2010
@@ -44,7 +44,7 @@ public abstract class ValueSource implem
* passed to createWeight()
*/
public DocValues getValues(Map context, IndexReader reader) throws IOException {
- return null;
+ return getValues(reader);
}
public abstract boolean equals(Object o);
Propchange: lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/maven/solr-solrj-pom.xml.template
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/solrj/org/
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/
('svn:mergeinfo' removed)
Propchange: lucene/solr/branches/branch-1.4/src/webapp/src/org/apache/solr/client/solrj/embedded/
('svn:mergeinfo' removed)