This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch feature/SLING-7792
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git.
omit ea63aeb Merge remote-tracking branch 'origin/master' into
feature/SLING-7792
omit 69753b3 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit fc1dadc SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 2387e26 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 8c41978 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 90246e9 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit a8e5517 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit b35fcc8 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 787540d SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit a382419 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 07afbd7 Merge remote-tracking branch
'origin/feature/update-testing-deps' into feature/SLING-7792
omit 5a1517f SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit b236efd SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 018d29e SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit ce31c41 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit d628ebb SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit e7bbf11 SLING-7792 - Resource Resolver should return more than one
resolved path if available
omit 316164d SLING-7792 - Resource Resolver should return more than one
resolved path if available
new c64f246 SLING-7792 - Resource Resolver should return more than one
resolved path if available
new 07955b3 SLING-7792 - Resource Resolver should return more than one
resolved path if available
new 33d2da9 SLING-7792 - Resource Resolver should return more than one
resolved path if available
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 (ea63aeb)
\
N -- N -- N refs/heads/feature/SLING-7792 (33d2da9)
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.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java | 2 +-
.../apache/sling/resourceresolver/impl/mapping/ResourceMapperImpl.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
