You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2016/07/06 21:51:31 UTC
lucene-solr:master: SOLR-7903: Comment out trappy references to
example docs in elevate.xml files
Repository: lucene-solr
Updated Branches:
refs/heads/master 1125a8a8e -> db295440a
SOLR-7903: Comment out trappy references to example docs in elevate.xml files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/db295440
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/db295440
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/db295440
Branch: refs/heads/master
Commit: db295440a6a9aa0d43a2611c81331feda50a5834
Parents: 1125a8a
Author: Erick Erickson <er...@apache.org>
Authored: Wed Jul 6 14:50:43 2016 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Wed Jul 6 14:50:43 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../solr/collection1/conf/elevate.xml | 24 ++++++++++++--------
.../src/test-files/solr/minimr/conf/elevate.xml | 24 ++++++++++++--------
.../src/test-files/solr/mrunit/conf/elevate.xml | 24 ++++++++++++--------
.../solrcelltest/collection1/conf/elevate.xml | 24 ++++++++++++--------
.../example-DIH/solr/db/conf/elevate.xml | 24 ++++++++++++--------
.../example-DIH/solr/mail/conf/elevate.xml | 24 ++++++++++++--------
.../example-DIH/solr/rss/conf/elevate.xml | 24 ++++++++++++--------
.../example-DIH/solr/solr/conf/elevate.xml | 24 ++++++++++++--------
solr/example/files/conf/elevate.xml | 24 ++++++++++++--------
.../data_driven_schema_configs/conf/elevate.xml | 24 ++++++++++++--------
.../conf/elevate.xml | 24 ++++++++++++--------
12 files changed, 156 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 33f5013..326bb42 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -147,6 +147,8 @@ Other Changes
* SOLR-9180: More comprehensive tests of psuedo-fields for RTG and SolrCloud requests (hossman)
+* SOLR-7930: Comment out trappy references to example docs in elevate.xml files (Erick Erickson)
+
================== 6.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/elevate.xml b/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/elevate.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/elevate.xml b/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/elevate.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/example/example-DIH/solr/db/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/elevate.xml b/solr/example/example-DIH/solr/db/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/example/example-DIH/solr/db/conf/elevate.xml
+++ b/solr/example/example-DIH/solr/db/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/example/example-DIH/solr/mail/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/elevate.xml b/solr/example/example-DIH/solr/mail/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/example/example-DIH/solr/mail/conf/elevate.xml
+++ b/solr/example/example-DIH/solr/mail/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/example/example-DIH/solr/rss/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/rss/conf/elevate.xml b/solr/example/example-DIH/solr/rss/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/example/example-DIH/solr/rss/conf/elevate.xml
+++ b/solr/example/example-DIH/solr/rss/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/example/example-DIH/solr/solr/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/elevate.xml b/solr/example/example-DIH/solr/solr/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/example/example-DIH/solr/solr/conf/elevate.xml
+++ b/solr/example/example-DIH/solr/solr/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/example/files/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/elevate.xml b/solr/example/files/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/example/files/conf/elevate.xml
+++ b/solr/example/files/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db295440/solr/server/solr/configsets/sample_techproducts_configs/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/elevate.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/elevate.xml
index 25d5ceb..2c09ebe 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/elevate.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/elevate.xml
@@ -24,15 +24,19 @@
-->
<elevate>
- <query text="foo bar">
- <doc id="1" />
- <doc id="2" />
- <doc id="3" />
- </query>
-
- <query text="ipod">
- <doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
- <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
+ <!-- Query elevation examples
+ <query text="foo bar">
+ <doc id="1" />
+ <doc id="2" />
+ <doc id="3" />
+ </query>
+
+for use with techproducts example
+ <query text="ipod">
+ <doc id="MA147LL/A" /> put the actual ipod at the top
+ <doc id="IW-02" exclude="true" /> exclude this cable
+ </query>
+-->
+
</elevate>