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:29:56 UTC
[lucene-solr] branch master updated (3e42286 -> 6b55d79)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 3e42286 SOLR-14546: OverseerTaskProcessor can process messages out of order (#1561)
new dc1e359 fixes SOLR-14584
new 3f4f5e2 SOLR-14584: CHANGES.txt entry
new 6b55d79 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 master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit dc1e359076822e2bbe9c16a2b9f77f5c23dd1c49
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 c8a6c8c..0c752da 100755
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -132,9 +132,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 3ecd7b9..2192aa4 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -152,9 +152,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] 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 master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 6b55d79bf37bcc92d08cef0c5c537ff95f9088f8
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 1bbe3b3..83d247c 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -874,7 +874,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 ' '`
[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 master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 3f4f5e2f76a61f71930041c3fab5634a6417e59c
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 9ca7a8a..d3a3c4d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -257,6 +257,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