You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 23:00:42 UTC
[1/3] lucene-solr:branch_5_5: SOLR-9151: Fix SolrCLI so that bin/solr
-e cloud example can be run from any CWD (cherry picked from commit 50c4f58)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 fa42b0039 -> 6d8fda0d6
refs/heads/branch_5x 9ebd60cee -> 1850d9bbb
refs/heads/branch_6_0 a7f2876ec -> b866e594d
SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD
(cherry picked from commit 50c4f58)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6d8fda0d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6d8fda0d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6d8fda0d
Branch: refs/heads/branch_5_5
Commit: 6d8fda0d606fc9add49202fee4c85a2c90412557
Parents: fa42b00
Author: Jan H�ydahl <ja...@apache.org>
Authored: Tue May 24 12:56:31 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 18:59:01 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d8fda0d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8fb10af..bd5a91d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -76,6 +76,8 @@ Bug Fixes
* SOLR-9134: Fix RestManager.addManagedResource return value. (Christine Poerschke)
+* SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD (janhoy)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d8fda0d/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 adc7e19..c966a57 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2490,7 +2490,7 @@ public class SolrCLI {
String solrHome = solrHomeDir.getAbsolutePath();
// don't display a huge path for solr home if it is relative to the cwd
- if (!isWindows && solrHome.startsWith(cwdPath))
+ if (!isWindows && cwdPath.length() > 1 && solrHome.startsWith(cwdPath))
solrHome = solrHome.substring(cwdPath.length()+1);
String startCmd =
[3/3] lucene-solr:branch_6_0: SOLR-9151: Fix SolrCLI so that bin/solr
-e cloud example can be run from any CWD (cherry picked from commit 50c4f58)
Posted by sa...@apache.org.
SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD
(cherry picked from commit 50c4f58)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b866e594
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b866e594
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b866e594
Branch: refs/heads/branch_6_0
Commit: b866e594d18ae47271b87e7dedd06ae26d622801
Parents: a7f2876
Author: Jan H�ydahl <ja...@apache.org>
Authored: Tue May 24 12:56:31 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 19:00:14 2016 -0400
----------------------------------------------------------------------
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/b866e594/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 6d5aa8f..3c2b609 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2490,7 +2490,7 @@ public class SolrCLI {
String solrHome = solrHomeDir.getAbsolutePath();
// don't display a huge path for solr home if it is relative to the cwd
- if (!isWindows && solrHome.startsWith(cwdPath))
+ if (!isWindows && cwdPath.length() > 1 && solrHome.startsWith(cwdPath))
solrHome = solrHome.substring(cwdPath.length()+1);
String startCmd =
[2/3] lucene-solr:branch_5x: SOLR-9151: Fix SolrCLI so that bin/solr
-e cloud example can be run from any CWD (cherry picked from commit 50c4f58)
Posted by sa...@apache.org.
SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD
(cherry picked from commit 50c4f58)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1850d9bb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1850d9bb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1850d9bb
Branch: refs/heads/branch_5x
Commit: 1850d9bbb0e27a6a1229c59cc76cf4dc4afe8862
Parents: 9ebd60c
Author: Jan H�ydahl <ja...@apache.org>
Authored: Tue May 24 12:56:31 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 18:59:43 2016 -0400
----------------------------------------------------------------------
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/1850d9bb/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 adc7e19..c966a57 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2490,7 +2490,7 @@ public class SolrCLI {
String solrHome = solrHomeDir.getAbsolutePath();
// don't display a huge path for solr home if it is relative to the cwd
- if (!isWindows && solrHome.startsWith(cwdPath))
+ if (!isWindows && cwdPath.length() > 1 && solrHome.startsWith(cwdPath))
solrHome = solrHome.substring(cwdPath.length()+1);
String startCmd =