You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2023/08/03 12:16:13 UTC
[solr] 02/02: Fix backport of SOLR-6994.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 113db7d13dcd4c41e6f41c409a7bdef7f83d7ed3
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Thu Aug 3 08:15:55 2023 -0400
Fix backport of SOLR-6994.
---
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
solr/core/src/test/org/apache/solr/cli/SimplePostToolTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/bin/solr b/solr/bin/solr
index 7aeae89b8af..32b66cb0aa2 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -342,7 +342,7 @@ function print_usage() {
if [ -z "${CMD:-}" ]; then
echo ""
echo "Usage: solr COMMAND OPTIONS"
- echo " where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, export, api, package, postlogs"
+ echo " where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, export, api, package, post, postlogs"
echo ""
echo " Standalone server example (start Solr running in the background on port 8984):"
echo ""
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 7b3ecdd9281..c6a64c5d07a 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -315,7 +315,7 @@ goto done
:script_usage
@echo.
@echo Usage: solr COMMAND OPTIONS
-@echo where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, export, api, package, postlogs
+@echo where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, export, api, package, post, postlogs
@echo.
@echo Standalone server example (start Solr running in the background on port 8984):
@echo.
diff --git a/solr/core/src/test/org/apache/solr/cli/SimplePostToolTest.java b/solr/core/src/test/org/apache/solr/cli/SimplePostToolTest.java
index 2f157057175..fdd58149a82 100644
--- a/solr/core/src/test/org/apache/solr/cli/SimplePostToolTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/SimplePostToolTest.java
@@ -165,7 +165,7 @@ public class SimplePostToolTest extends SolrTestCaseJ4 {
assertEquals("application/msword", SimplePostTool.guessType(f));
f = new File("foobar");
assertEquals("application/octet-stream", SimplePostTool.guessType(f));
- f = new File("foo.jsonl");
+ f = new File("foo.json");
assertEquals("application/json", SimplePostTool.guessType(f));
}