Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A89B5200B34 for ; Sat, 18 Jun 2016 01:26:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A74CB160A61; Fri, 17 Jun 2016 23:26:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 085D4160A63 for ; Sat, 18 Jun 2016 01:26:34 +0200 (CEST) Received: (qmail 25625 invoked by uid 500); 17 Jun 2016 23:26:34 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 25408 invoked by uid 99); 17 Jun 2016 23:26:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jun 2016 23:26:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D68A8E094C; Fri, 17 Jun 2016 23:26:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sarowe@apache.org To: commits@lucene.apache.org Date: Fri, 17 Jun 2016 23:26:35 -0000 Message-Id: <007cb4f491b942e4ae11c4c58a4ee556@git.apache.org> In-Reply-To: <9581667cab4b4279a5e9512ea46a95f1@git.apache.org> References: <9581667cab4b4279a5e9512ea46a95f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] lucene-solr:branch_6_0: SOLR-8676: keep LOG4J_CONFIG in solr.cmd archived-at: Fri, 17 Jun 2016 23:26:35 -0000 SOLR-8676: keep LOG4J_CONFIG in solr.cmd Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/60c140c2 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/60c140c2 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/60c140c2 Branch: refs/heads/branch_6_0 Commit: 60c140c244c4f93bbd3af2fe1b6244101a8db971 Parents: 7e2252c Author: Mikhail Khludnev Authored: Fri Jun 3 01:05:28 2016 +0300 Committer: Steve Rowe Committed: Fri Jun 17 19:26:26 2016 -0400 ---------------------------------------------------------------------- solr/bin/solr.cmd | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/60c140c2/solr/bin/solr.cmd ---------------------------------------------------------------------- diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd index a8d71c4..6889bef 100644 --- a/solr/bin/solr.cmd +++ b/solr/bin/solr.cmd @@ -657,7 +657,6 @@ IF "%STOP_KEY%"=="" set STOP_KEY=solrrocks @REM so that we can write logs for examples to %SOLR_HOME%\..\logs set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs" set "EXAMPLE_DIR=%SOLR_TIP%\example" -set LOG4J_CONFIG= set TMP=!SOLR_HOME:%EXAMPLE_DIR%=! IF NOT "%TMP%"=="%SOLR_HOME%" ( set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs"