This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new a7441c175a4 SOLR-17074: Fixed not correctly escaped quote in bin/solr
script (#2200)
a7441c175a4 is described below
commit a7441c175a4b86817a1dc3deeb3d4761bc1150da
Author: Vincenzo D'Amore <[email protected]>
AuthorDate: Mon Jan 22 13:21:33 2024 +0100
SOLR-17074: Fixed not correctly escaped quote in bin/solr script (#2200)
---
solr/CHANGES.txt | 2 ++
solr/bin/solr | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b87880ecaa9..f119c988c2e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -167,6 +167,8 @@ Bug Fixes
* SOLR-17116: The INSTALLSHARDDATA "collection-admin" API now reports errors
correctly when run asynchronously. (Jason Gerlowski)
+* SOLR-17074: Fixed not correctly escaped quote in bin/solr script (Dominique
Béjean, Vincenzo D'Amore)
+
Dependency Upgrades
---------------------
* SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (Kevin
Risden)
diff --git a/solr/bin/solr b/solr/bin/solr
index 5e2e46e9806..6b8270d66e0 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -422,8 +422,8 @@ function print_usage() {
echo ""
echo " -noprompt Don't prompt for input; accept all defaults
when running examples that accept user input"
echo ""
- echo " -force If attempting to start Solr as the root
user, the script will exit with a warning that running Solr as "root" can cause
problems."
- echo " It is possible to override this warning
with the `-force` parameter."
+ echo " -force If attempting to start Solr as the root
user, the script will exit with a warning that running Solr as \"root\" can
cause problems."
+ echo " It is possible to override this warning
with the '-force' parameter."
echo ""
echo " -v and -q Verbose (-v) or quiet (-q) logging. Sets
default log level of Solr to DEBUG or WARN instead of INFO"
echo ""