From 5ecc6dfaf890a117f21873725eba81feb1586d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 12 Aug 2019 13:56:35 +0200 Subject: [PATCH] SOLR-13647: Default solr.in.sh contains incorrect default value (cherry picked from commit d468d71c030dba77fb7e6bed295e5766248a5944) --- solr/CHANGES.txt | 6 ++++-- solr/bin/solr.in.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 972255c946f..2ac25bc42a3 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -74,8 +74,10 @@ Bug Fixes * SOLR-13206: Fix AIOOBE when group.facet is specified with group.query and return proper error code. (Marek, Munendra S N) -* SOLR-11556: Backup and restore command really supports picking one of a few repositories by - repository parameter (Timothy Potter via Mikhail Khludnev) +* SOLR-11556: Backup and restore command really supports picking one of a few repositories by + repository parameter (Timothy Potter via Mikhail Khludnev) + +* SOLR-13647: Default solr.in.sh contains incorrect default value (John Ryan) * SOLR-13660: Fixed AbstractFullDistribZkTestBase.waitForActiveReplicaCount() to ensure replicas are active. (hossman) diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh index cd063381ab6..9d1be37d2e3 100644 --- a/solr/bin/solr.in.sh +++ b/solr/bin/solr.in.sh @@ -82,7 +82,7 @@ # Set to true to activate the JMX RMI connector to allow remote JMX client applications # to monitor the JVM hosting Solr; set to "false" to disable that behavior # (false is recommended in production environments) -ENABLE_REMOTE_JMX_OPTS="true" +#ENABLE_REMOTE_JMX_OPTS="false" # The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here # RMI_PORT=18983