This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch release-3.2
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
The following commit(s) were added to refs/heads/release-3.2 by this push:
new 3406b042 Update changes
3406b042 is described below
commit 3406b042a9957557ab55c3b6626419b856cf2a19
Author: Thomas Vandahl <[email protected]>
AuthorDate: Sat May 6 21:46:41 2023 +0200
Update changes
---
src/changes/changes.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 87a8d8d7..7173f10a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,11 +21,10 @@
<author email="[email protected]">Apache Commons
Developers</author>
</properties>
<body>
-<<<<<<< HEAD
<release version="3.2" date="2023-02-05">
-=======
- <release version="3.1.1" date="TBD">
->>>>>>> refs/remotes/origin/master
+ <action dev="tv" type="fix" issue="JCS-234" due-to="Chris Lake">
+ Fix OSGi manifest
+ </action>
<action dev="tv" type="fix" issue="JCS-232" due-to="Jeremy Long">
Handle ServiceConfigurationError when using a different logging
framework
</action>
