You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2024/01/22 12:26:50 UTC
(solr) branch branch_9x updated (390f5ca3531 -> f20c868e453)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 390f5ca3531 SOLR-15960: Rename getProp as getProperty (#2194)
new 4b1d2917921 SOLR-17074: Fixed not correctly escaped quote in bin/solr script (#2200)
new f20c868e453 solr-ref-guide: fix typo in result-clustering.adoc (#2210)
The 2 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 | 2 ++
solr/bin/solr | 4 ++--
solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
(solr) 01/02: SOLR-17074: Fixed not correctly escaped quote in bin/solr script (#2200)
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4b1d291792159923c85f7d3bd81c2d4624a28ee2
Author: Vincenzo D'Amore <46...@users.noreply.github.com>
AuthorDate: Mon Jan 22 13:21:33 2024 +0100
SOLR-17074: Fixed not correctly escaped quote in bin/solr script (#2200)
(cherry picked from commit a7441c175a4b86817a1dc3deeb3d4761bc1150da)
---
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 b1a12d5680f..435cc31b39e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -96,6 +96,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 278c6177924..a6af5efdb7e 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -440,8 +440,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 ""
(solr) 02/02: solr-ref-guide: fix typo in result-clustering.adoc (#2210)
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit f20c868e453cd89b6ea6e78f7545d35e1a1b5d52
Author: Lance Harper <la...@gmail.com>
AuthorDate: Mon Jan 22 04:22:16 2024 -0800
solr-ref-guide: fix typo in result-clustering.adoc (#2210)
(cherry picked from commit 10268a3cfcb60e625383c1dc16d9abdafb99976d)
---
solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc b/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
index 113542e070a..11433c6fa7c 100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
@@ -80,7 +80,7 @@ Once attached, as in the example above, the clustering will be performed automat
on all documents matching the search handler's query.
The clustering extension will take into
account all text fields listed in `clustering.fields` parameter of the engine and will
-product a section of the response called `clusters` containing the discovered structure of
+produce a section of the response called `clusters` containing the discovered structure of
groups, for example (JSON response for brevity):
[source,json]