You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/03/08 14:21:28 UTC
[1/2] lucene-solr git commit: SOLR-8766: deprecated tag in
solrconfig.xml is removed
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_0 047c37b2d -> 132af5cc7
SOLR-8766: deprecated <admin> tag in solrconfig.xml is removed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/84b06e2e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/84b06e2e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/84b06e2e
Branch: refs/heads/branch_6_0
Commit: 84b06e2ef1d8648b9584bff6fe1f62359ff2ca1b
Parents: d92f1f1
Author: Noble Paul <no...@apache.org>
Authored: Tue Mar 8 18:49:44 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Mar 8 18:49:44 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/test-files/solr/collection1/conf/solrconfig.xml | 6 ------
.../src/test-files/solr/minimr/conf/solrconfig.xml | 6 ------
.../src/test-files/solr/mrunit/conf/solrconfig.xml | 7 -------
.../solr/solrcelltest/collection1/conf/solrconfig.xml | 6 ------
.../src/test-files/solr/solrcloud/conf/solrconfig.xml | 6 ------
solr/example/example-DIH/solr/db/conf/solrconfig.xml | 6 ------
solr/example/example-DIH/solr/mail/conf/solrconfig.xml | 6 ------
solr/example/example-DIH/solr/rss/conf/solrconfig.xml | 6 ------
solr/example/example-DIH/solr/solr/conf/solrconfig.xml | 6 ------
solr/example/example-DIH/solr/tika/conf/solrconfig.xml | 7 -------
solr/example/files/conf/solrconfig.xml | 6 ------
solr/server/solr/configsets/basic_configs/conf/solrconfig.xml | 5 -----
.../configsets/data_driven_schema_configs/conf/solrconfig.xml | 7 -------
.../sample_techproducts_configs/conf/solrconfig.xml | 6 ------
15 files changed, 2 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 257691d..265410c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -388,6 +388,8 @@ Other Changes
* SOLR-8736: schema GET operations on fields, dynamicFields, fieldTypes, copyField are
reimplemented as a part of the bulk API with less details (noble)
+* SOLR-8766 : deprecated <admin> tag in solrconfig.xml is removed (noble)
+
================== 5.5.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
index b8d1ca6..ab1acd9 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -1487,11 +1487,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
index 65637c1..f5ce41b 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
@@ -1508,10 +1508,4 @@
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
index 691643f..d40b16d 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
@@ -1511,11 +1511,4 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
index b8d1ca6..ab1acd9 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
@@ -1487,11 +1487,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
index 336c789..9d33201 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
@@ -1510,11 +1510,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index aceeee0..f489827 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -1486,11 +1486,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index f3a3273..1c424c8 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -1489,11 +1489,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index 4ec9180..a125c30 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
@@ -1485,11 +1485,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index f501a08..9f010e1 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -1485,11 +1485,5 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index b3c08e8..f48510b 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
@@ -1463,11 +1463,4 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 97682f6..49dda22 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -1505,10 +1505,4 @@
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index f2f14e2..58c7025 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
@@ -559,9 +559,4 @@
</arr>
</requestHandler>
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 00485c7..39801b1 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -1479,11 +1479,4 @@
EditorialMarkerFactory will do exactly that:
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b06e2e/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index bab4814..33cfe34 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -1698,10 +1698,4 @@
<transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
-->
-
- <!-- Legacy config for the admin interface -->
- <admin>
- <defaultQuery>*:*</defaultQuery>
- </admin>
-
</config>
[2/2] lucene-solr git commit: Merge remote-tracking branch
'origin/branch_6_0' into branch_6_0
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6_0' into branch_6_0
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/132af5cc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/132af5cc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/132af5cc
Branch: refs/heads/branch_6_0
Commit: 132af5cc7d473c26ec6765c0f5bd0aeaf9e5841b
Parents: 84b06e2 047c37b
Author: Noble Paul <no...@apache.org>
Authored: Tue Mar 8 18:51:19 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Mar 8 18:51:19 2016 +0530
----------------------------------------------------------------------
.../index/BaseStoredFieldsFormatTestCase.java | 53 ++++++++------------
1 file changed, 22 insertions(+), 31 deletions(-)
----------------------------------------------------------------------