You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/02/04 00:06:43 UTC

[logging-log4j2] branch release-2.x updated: Update changes.xml for next release

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 d7d799f  Update changes.xml for next release
d7d799f is described below

commit d7d799fe673a354340655d283db40d33eb972e3f
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Feb 3 17:06:32 2019 -0700

    Update changes.xml for next release
---
 src/changes/changes.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ab5b5d1..b243683 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,7 +30,8 @@
          - "update" - Change
          - "remove" - Removed
     -->
-<<<<<<< HEAD
+    <release version="2.12.0" date="2019-MM-DD" description="GA Release 2.12.0">
+    </release>
     <release version="2.11.2" date="2019-02-03" description="GA Release 2.11.2">
       <action issue="LOG4J2-2500" dev="rgoers" type="fix">
         Document that Properties element must be the first configuration element.