You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/07/13 18:42:18 UTC

lucene-solr:branch_6x: LUCENE-7013: ClassificationUpdateProcessorFactory.java: fix bad merge (merged master import into branch_6x)

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x c2866c770 -> e0213933d


LUCENE-7013: ClassificationUpdateProcessorFactory.java: fix bad merge (merged master import into branch_6x)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e0213933
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e0213933
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e0213933

Branch: refs/heads/branch_6x
Commit: e0213933dd52efb12e60421c8b749a2c10460bb2
Parents: c2866c7
Author: Steve Rowe <sa...@apache.org>
Authored: Wed Jul 13 14:42:08 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Wed Jul 13 14:42:08 2016 -0400

----------------------------------------------------------------------
 .../update/processor/ClassificationUpdateProcessorFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e0213933/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
index 692a114..f16b42b 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java
@@ -17,7 +17,7 @@
 
 package org.apache.solr.update.processor;
 
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.LeafReader;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;