This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
was df5ad6914 Merge remote-tracking branch 'origin/release/struts-6-7-x'
into issue-85/CONFSRVDEV-37138-merge-upstream
This change permanently discards the following revisions:
discard df5ad6914 Merge remote-tracking branch 'origin/release/struts-6-7-x'
into issue-85/CONFSRVDEV-37138-merge-upstream
discard f50587ade [maven-release-plugin] prepare for next development iteration
discard ec1a70e56 [maven-release-plugin] prepare release
struts2-parent-6.7.0-atlassian-2
discard ca04a99d3 Pull request #28: CONFSRVDEV-37099 Backport of
CVE-2024-53677 fix from 7.0
discard 98348790e CONFSRVDEV-37099 Backport of CVE-2024-53677 fix from 7.0
discard 7ee62ea6c [maven-release-plugin] prepare for next development iteration
discard 28cc851ab [maven-release-plugin] prepare release
struts2-parent-6.7.0-atlassian-1
discard 7fa08d053 Merge remote-tracking branch 'origin/master' into release/6.7
discard c2c35251a CONFSRVDEV-34293 Add Bamboo build note to README
discard dc88606ce CONFSRVDEV-34293 Fix Struts 6.6 build
discard 7969e5932 [maven-release-plugin] prepare for next development iteration
discard 90fa39363 [maven-release-plugin] prepare release
struts2-parent-6.6.1-atlassian-1
discard 7113ff8f5 Update SNAPSHOT version
discard 91ef86894 Merge remote-tracking branch 'origin/master' into fork/6.6
discard 183352bc4 [maven-release-plugin] prepare for next development iteration
discard b1a8797c9 [maven-release-plugin] prepare release
struts2-parent-6.6.0-atlassian-1
discard 9ce0a4893 Merge remote-tracking branch 'origin/master' into fork/6.6
discard 62b9871a6 [maven-release-plugin] prepare for next development iteration
discard 5e7c00afb [maven-release-plugin] prepare release
struts2-parent-6.4.0-atlassian-1