You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/10/31 15:15:00 UTC
[08/15] lucene-solr:jira/solr-8593: SOLR-9697: Fixed zk upconfig
which was broken on windows
SOLR-9697: Fixed zk upconfig which was broken on windows
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2ad2fca4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2ad2fca4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2ad2fca4
Branch: refs/heads/jira/solr-8593
Commit: 2ad2fca4169374225e6d08a072c3121beba24a93
Parents: 813b685
Author: Jan H�ydahl <ja...@apache.org>
Authored: Mon Oct 31 09:35:09 2016 +0100
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Mon Oct 31 09:35:09 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/bin/solr.cmd | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2ad2fca4/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6c3ffcc..2f46416 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -279,6 +279,8 @@ Bug Fixes
* SOLR-2094: XPathEntityProcessor should reinitialize the XPathRecordReader instance if
the 'forEach' or 'xpath' attributes are templates & it is not a root entity (Cao Manh Dat, noble)
+
+* SOLR-9697: zk upconfig broken on windows (Xavier Jmlucjav via janhoy)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2ad2fca4/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 262a6f8..9860d77 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1361,7 +1361,6 @@ IF "%1"=="-upconfig" (
if not "%~1"=="" (
goto set_zk_src
)
- goto zk_usage
) ELSE IF "!ZK_DST!"=="" (
IF "%ZK_OP%"=="cp" (
goto set_zk_dst