This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3c22524516 Update merge info. FileUpload was manually synchronized
with 1.x.
3c22524516 is described below
commit 3c225245161c5481aeb5eda4d1d77fa434bab3ac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 4 13:06:19 2024 +0100
Update merge info. FileUpload was manually synchronized with 1.x.
---
MERGE.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MERGE.txt b/MERGE.txt
index 8404019433..c3e81ab842 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,10 +51,11 @@ Note: Only classes required for Base64 encoding/decoding.
The rest are removed.
FileUpload
----------
Unused code is removed
+Branch: 1.x
Sub-tree:
src/main/java/org/apache/commons/fileupload2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-34eb241c051b02eca3b0b1b04f67b3b4e6c3a24d (2023-01-03)
+7a8c3241cfa8d036452cd4fc3f92d57cff189bca (2023-09-16)
Note: Tomcat's copy of fileupload also includes classes copied manually from
Commons IO.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
