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/31 08:37:11 UTC
lucene-solr:branch_6x: SOLR-9697: Fixed zk upconfig which was broken
on windows
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 96372be35 -> 331de3d71
SOLR-9697: Fixed zk upconfig which was broken on windows
(cherry picked from commit 2ad2fca)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/331de3d7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/331de3d7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/331de3d7
Branch: refs/heads/branch_6x
Commit: 331de3d71f4092e6343c3ed50af3388041674209
Parents: 96372be
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:37:04 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/331de3d7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ba55d94..49c7cf4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -288,6 +288,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: Fix zk upconfig which was broken on windows (Xavier Jmlucjav via janhoy)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/331de3d7/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 766a6d1..28de63f 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1357,7 +1357,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