SOLR-9697: Fixed zk upconfig which was broken on windows

(cherry picked from commit 2ad2fca)
2016-10-31 09:35:09 +01:00 · 2016-10-31 09:35:09 +01:00 · 331de3d71f
parent 96372be35c
commit 331de3d71f
2 changed files with 2 additions and 1 deletions
--- 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
 ----------------------

--- 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