This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5478-delete-result in repository https://gitbox.apache.org/repos/asf/struts.git
discard 792497f0c WW-5478 Delete deprecated DefaultResultFactory discard 3bd473b2d Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-02 add a43f8a523 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-02 add ecad4a576 Replace com.opensymphony.xwork2 mentions add 0d0560370 WW-5478 Delete deprecated DefaultResultFactory This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (792497f0c) \ N -- N -- N refs/heads/7.0.x/WW-5478-delete-result (0d0560370) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../interceptor/ActionFileUploadInterceptor.java | 2 +- .../parameter/ParametersInterceptor.java | 33 +++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-)