[TASK] revert unnecessary changes on Apache Solr 9.2 upgrade

TYPO3-Solr · Jun 7, 2023 · 0dd90ff · 0dd90ff
1 parent fb9043c
commit 0dd90ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Documentation/Releases/solr-release-11-2.rst b/Documentation/Releases/solr-release-11-2.rst
@@ -107,7 +107,7 @@ Beside the major changes we did several small improvements and bugfixes:
 - [TASK] Setup Dependabot to watch "solarium/solarium" .. __: https://github.com/TYPO3-Solr/ext-solr/commit/561815044e3651a0aaa8fa2ad4de5e2c3ccf4e3e
 - [BUGFIX] Filter within route enhancers .. __: https://github.com/TYPO3-Solr/ext-solr/issues/3054
 - [BUGFIX] Fix NON-Composer mod libs composer.json for composer v2 .. __: https://github.com/TYPO3-Solr/ext-solr/issues/3053
-- ... See older commits, which are a part of previous releases: https://github.com/TYPO3-Solr/ext-solr/commits/master?after=d3f9a919d44f8a72b982bdde131408b571ff02c8+139&branch=release-11-2
+- ... See older commits, which are a part of previous releases: https://github.com/TYPO3-Solr/ext-solr/commits/main?after=d3f9a919d44f8a72b982bdde131408b571ff02c8+139&branch=release-11-2
 
 
 Contributors

diff --git a/Resources/Private/Solr/configsets/ext_solr_12_0_0/conf/solrconfig.xml b/Resources/Private/Solr/configsets/ext_solr_12_0_0/conf/solrconfig.xml
@@ -301,21 +301,21 @@
 
 	<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy">
 		<!--
-		To enable simple master/slave replication, uncomment one of the
+		To enable simple primary/replica replication, uncomment one of the
 		sections below, depending on whether this solr instance should be
-		the "master" or a "slave".  If this instance is a "slave" you will
-		also need to fill in the masterUrl to point to a real machine.
+		the "primary" or a "replica".  If this instance is a "replica" you will
+		also need to fill in the primaryUrl to point to a real machine.
 		-->
 		<!--
-		<lst name="master">
+		<lst name="primary">
 				<str name="replicateAfter">commit</str>
 				<str name="replicateAfter">startup</str>
 				<str name="confFiles">schema.xml,stopwords.txt</str>
 		</lst>
 		-->
 		<!--
-		<lst name="slave">
-				<str name="masterUrl">http://your-master-hostname:8983/solr</str>
+		<lst name="replica">
+				<str name="primaryUrl">http://your-primary-hostname:8983/solr</str>
 				<str name="pollInterval">00:00:60</str>
 		</lst>
 		-->