You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by ro...@apache.org on 2018/08/17 08:26:27 UTC

[sling-org-apache-sling-resourceresolver] 01/01: Merge remote-tracking branch 'origin/master' into feature/SLING-7792

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-7792
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git

commit ea63aeb2ff5f48673cc86a0e408f196447592bfd
Merge: 69753b3 8a88532
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 17 10:25:27 2018 +0200

    Merge remote-tracking branch 'origin/master' into feature/SLING-7792

 .../org/apache/sling/resourceresolver/impl/Fixture.java    | 14 ++++++++++++--
 .../impl/providers/ResourceProviderTrackerTest.java        |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)