You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2020/06/23 15:31:49 UTC
[lucene-solr] branch branch_8x updated (885da40 -> 1575781)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 885da40 SOLR-14554: Let Solr use WAND algorithm when scores are requested (#1566)
new 57fdb91 fixes SOLR-14584
new 35e6fa3 SOLR-14584: CHANGES.txt entry
new 1575781 SOLR-14702: increase bin/solr's post kill sleep (from 1s to 10s)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/CHANGES.txt | 3 +++
solr/bin/solr | 2 +-
solr/bin/solr.in.cmd | 4 ++--
solr/bin/solr.in.sh | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
[lucene-solr] 01/03: fixes SOLR-14584
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 57fdb91f6ffb1076b373b091643aae287b82eb90
Author: Aren Cambre <ar...@arencambre.com>
AuthorDate: Sat Jun 20 13:37:25 2020 -0500
fixes SOLR-14584
---
solr/bin/solr.in.cmd | 4 ++--
solr/bin/solr.in.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
index 3b4440b..f27330a 100755
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -127,9 +127,9 @@ REM to enable https module with custom jetty configuration.
REM set SOLR_SSL_ENABLED=true
REM Uncomment to set SSL-related system properties
REM Be sure to update the paths to the correct keystore for your environment
-REM set SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks
+REM set SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.p12
REM set SOLR_SSL_KEY_STORE_PASSWORD=secret
-REM set SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks
+REM set SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.p12
REM set SOLR_SSL_TRUST_STORE_PASSWORD=secret
REM Require clients to authenticate
REM set SOLR_SSL_NEED_CLIENT_AUTH=false
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index 1fcf232..29261ce 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -144,9 +144,9 @@
#SOLR_SSL_ENABLED=true
# Uncomment to set SSL-related system properties
# Be sure to update the paths to the correct keystore for your environment
-#SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks
+#SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.p12
#SOLR_SSL_KEY_STORE_PASSWORD=secret
-#SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks
+#SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.p12
#SOLR_SSL_TRUST_STORE_PASSWORD=secret
# Require clients to authenticate
#SOLR_SSL_NEED_CLIENT_AUTH=false
[lucene-solr] 02/03: SOLR-14584: CHANGES.txt entry
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 35e6fa33a2351cd86c269656c06e5b674fe9ca6a
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Jun 23 16:12:59 2020 +0100
SOLR-14584: CHANGES.txt entry
SOLR-14584: Correct SOLR_SSL_KEY_STORE and SOLR_SSL_TRUST_STORE example comments in solr.in.sh and solr.in.cmd files
(Aren Cambre via Christine Poerschke)
Closes #1597
---
solr/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9a7d13d..469f2ff 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -177,6 +177,9 @@ Bug Fixes
* SOLR-14577: Return 400 BAD REQUEST when field is missing on a Terms query parser request
(Tomás Fernández Löbbe)
+* SOLR-14584: Correct SOLR_SSL_KEY_STORE and SOLR_SSL_TRUST_STORE example comments in solr.in.sh and solr.in.cmd files
+ (Aren Cambre via Christine Poerschke)
+
Other Changes
---------------------
* SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid
[lucene-solr] 03/03: SOLR-14702: increase bin/solr's post kill
sleep (from 1s to 10s)
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 15757815dfbcec19cbc9a2dd817f6f01559435f8
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Jun 23 16:14:27 2020 +0100
SOLR-14702: increase bin/solr's post kill sleep (from 1s to 10s)
---
solr/bin/solr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/bin/solr b/solr/bin/solr
index 3d09ccd..e178bcd 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -873,7 +873,7 @@ function stop_solr() {
kill -9 $SOLR_PID
echo "Killed process $SOLR_PID"
rm -f "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
- sleep 1
+ sleep 10
fi
CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $SOLR_PID | sort -r | tr -d ' '`