[logging-log4j2] branch release-2.x updated: LOG4J2-2859 - Fixed typos where mergeFactory should be mergeStrategy.

[rg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new 2bc39a1  LOG4J2-2859 - Fixed typos where mergeFactory should be mergeStrategy.
2bc39a1 is described below

commit 2bc39a134f2f4cb684ff9fcf9d7c0df6270f4800
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Tue Jul 28 15:09:32 2020 -0700

    LOG4J2-2859 - Fixed typos where mergeFactory should be mergeStrategy.
---
 .../logging/log4j/util/LegacyPropertiesCompatibilityTest.java       | 2 +-
 src/changes/changes.xml                                             | 3 +++
 src/site/xdoc/manual/configuration.xml.vm                           | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
index b979d9a..2d60fbd 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
@@ -39,7 +39,7 @@ public class LegacyPropertiesCompatibilityTest {
     public static Object[][] data() {
         return new Object[][]{
             {"log4j2.configurationFile", "log4j.configurationFile"},
-            {"log4j2.mergeFactory", "log4j.mergeFactory"},
+            {"log4j2.mergeStrategy", "log4j.mergeStrategy"},
             {"log4j2.contextSelector", "Log4jContextSelector"},
             {"log4j2.logEventFactory", "Log4jLogEventFactory"},
             {"log4j2.configurationFactory", "log4j.configurationFactory"},
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a6da7b7..183d367 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
          - "remove" - Removed
     -->
     <release version="2.14.0" date="2020-MM-DD" description="GA Release 2.14.0">
+      <action issue="LOG4J2-2859" dev="rgoers" type="fix" due-to="Yanming Zhou">
+        Fixed typos where mergeFactory should be mergeStrategy.
+      </action>
       <action issue="LOG4J2-2832" dev="rgoers" type="fix" due-to="Benjamin Asbach">
         Correct class name printed in error message in RollingFileAppender.
       </action>
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index aac06d3..61ca1a1 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -1700,11 +1700,11 @@ public class AwesomeTest {
     </td>
   </tr>
   <tr>
-    <td><a name="mergeFactory"/>log4j2.mergeFactory
+    <td><a name="mergeStrategy"/>log4j2.mergeStrategy
       <br />
-      (<a name="log4j.mergeFactory"/>log4j.mergeFactory)
+      (<a name="log4j.mergeStrategy"/>log4j.mergeStrategy)
     </td>
-    <td>LOG4J_MERGE_FACTORY</td>
+    <td>LOG4J_MERGE_STRATEGY</td>
     <td>&nbsp;</td>
     <td>
       The name of the class that implements the MergeStrategy interface. If not specified