You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/10/22 00:32:09 UTC
lucene-solr:branch_6x: SOLR-9610: Bugfix option key for assertTool
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x d18666b33 -> fd623d4cf
SOLR-9610: Bugfix option key for assertTool
(cherry picked from commit 3488f12)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fd623d4c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fd623d4c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fd623d4c
Branch: refs/heads/branch_6x
Commit: fd623d4cfdaa934edd7f92b8f72e5899e26a27c3
Parents: d18666b
Author: Jan H�ydahl <ja...@apache.org>
Authored: Sat Oct 22 02:31:27 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Sat Oct 22 02:32:02 2016 +0200
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fd623d4c/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index b0d3186..0010d1e 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -3268,7 +3268,7 @@ public class SolrCLI {
if (cli.hasOption("s")) {
if (assertSolrRunning(cli.getOptionValue("s")) > 0) return 1;
}
- if (cli.hasOption("s")) {
+ if (cli.hasOption("S")) {
if (assertSolrNotRunning(cli.getOptionValue("S")) > 0) return 1;
}
return 0;