You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/01/23 13:28:15 UTC
[43/51] lucene-solr:jira/solr-11714: SOLR-11810: Upgrade Jetty to
9.4.8
SOLR-11810: Upgrade Jetty to 9.4.8
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2900bb59
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2900bb59
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2900bb59
Branch: refs/heads/jira/solr-11714
Commit: 2900bb597db4e312fbfe828a77ba11026866ae86
Parents: 03095ce
Author: Erick Erickson <er...@apache.org>
Authored: Wed Jan 17 11:33:22 2018 -0800
Committer: Erick Erickson <er...@apache.org>
Committed: Wed Jan 17 11:33:22 2018 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 4 ++--
solr/server/etc/jetty-http.xml | 1 -
solr/server/etc/jetty-https.xml | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2900bb59/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2179602..a6b2415 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -92,8 +92,6 @@ New Features
* SOLR-11854: multivalued primitive fields can now be sorted by implicitly choosing the min/max
value for asc/desc sort orders. (hossman)
-* SOLR-11810: Upgrade Jetty to 9.4.8.v20171121 (Varun Thacker, Erick Erickson)
-
* SOLR-11592: Add OpenNLP language detection to the langid contrib. (Koji, Steve Rowe)
Bug Fixes
@@ -156,6 +154,8 @@ Other Changes
* SOLR-11817: Move Collections API classes to it's own package (Varun Thacker)
+* SOLR-11810: Upgrade Jetty to 9.4.8.v20171121 (Varun Thacker, Erick Erickson)
+
================== 7.2.1 ==================
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/2900bb59/solr/server/etc/jetty-http.xml
----------------------------------------------------------------------
diff --git a/solr/server/etc/jetty-http.xml b/solr/server/etc/jetty-http.xml
index 6d92830..171a7e6 100644
--- a/solr/server/etc/jetty-http.xml
+++ b/solr/server/etc/jetty-http.xml
@@ -38,7 +38,6 @@
<Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="120000"/></Set>
<Set name="soLingerTime"><Property name="solr.jetty.http.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.http.acceptorPriorityDelta" default="0"/></Set>
- <Set name="selectorPriorityDelta"><Property name="solr.jetty.http.selectorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.http.acceptQueueSize" default="0"/></Set>
</New>
</Arg>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2900bb59/solr/server/etc/jetty-https.xml
----------------------------------------------------------------------
diff --git a/solr/server/etc/jetty-https.xml b/solr/server/etc/jetty-https.xml
index d34d4bd..32685ff 100644
--- a/solr/server/etc/jetty-https.xml
+++ b/solr/server/etc/jetty-https.xml
@@ -45,7 +45,6 @@
<Set name="idleTimeout"><Property name="solr.jetty.https.timeout" default="120000"/></Set>
<Set name="soLingerTime"><Property name="solr.jetty.https.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
- <Set name="selectorPriorityDelta"><Property name="solr.jetty.ssl.selectorPriorityDelta" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="solr.jetty.https.acceptQueueSize" default="0"/></Set>
</New>
</Arg>