From 2ad2fca4169374225e6d08a072c3121beba24a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Mon, 31 Oct 2016 09:35:09 +0100
Subject: [PATCH] SOLR-9697: Fixed zk upconfig which was broken on windows

---
 solr/CHANGES.txt  | 2 ++
 solr/bin/solr.cmd | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6c3ffccee5c..2f464167903 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
 ----------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 262a6f8a25b..9860d773d04 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