This is an automated email from the ASF dual-hosted git repository.
royteeuwen pushed a change to branch backport/SLING-13277-1.x
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
omit 9078f2e4 SLING-13277: use java.nio.charset.CharSet to instantiate the
String (backport to 1.x)
add 600cbfc6 SLING-13276: Prevent creating a resource with a name only
consisting out of dots (backport to 1.x)
add 36e64d46 Merge pull request #220 from apache/backport/SLING-13276-1.x
add 3dca30ed SLING-13275: cache the result of the getParentResourceType
call (backport to 1.x)
add 9511b71e Merge pull request #219 from apache/backport/SLING-13275-1.x
add f2478538 chore(test): make test_event_alias_during_bg_init
deterministic
add eeec4699 Merge pull request #223 from
apache/chore/deflake-alias-bg-init-test-1.x
add 0342c53d SLING-13277: use java.nio.charset.CharSet to instantiate the
String (backport to 1.x)
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 (9078f2e4)
\
N -- N -- N refs/heads/backport/SLING-13277-1.x (0342c53d)
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:
.../impl/ResourceResolverImpl.java | 27 ++++++++++++++++++----
.../impl/ResourceResolverImplTest.java | 25 +++++++++++++++++++-
.../impl/mapping/AliasMapEntriesTest.java | 15 +++++++-----
3 files changed, 56 insertions(+), 11 deletions(-)
