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

[ja...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6_3 d4797a167 -> 11e7e356e


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

(cherry picked from commit 2ad2fca)

(cherry picked from commit 331de3d)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/11e7e356
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/11e7e356
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/11e7e356

Branch: refs/heads/branch_6_3
Commit: 11e7e356e15ad5f9e3cfe26966c9dd5f666ece61
Parents: d4797a1
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:44:49 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/11e7e356/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6f5b07d..ca622b5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -249,6 +249,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/11e7e356/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