This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
omit b3e5c2429 Fixes after merge assembly issue
add ce7671568 Fixes after merge assembly issue
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 (b3e5c2429)
\
N -- N -- N refs/heads/release/struts-7-0-x (ce7671568)
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:
assembly/pom.xml | 4 +-
.../admin/src/main/resources/osgi/admin/shell.ftl | 0
core/pom.xml | 45 ----------------------
pom.xml | 9 +++++
4 files changed, 11 insertions(+), 47 deletions(-)
delete mode 100644 bundles/admin/src/main/resources/osgi/admin/shell.ftl
