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

Posted to commits@sling.apache.org by ss...@apache.org on 2019/05/24 09:32:41 UTC

[sling-org-apache-sling-testing-sling-mock] 02/02: Merge branch 'feature/SLING-8428-mixin-linkedfile'

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 17ffdf7b41689303f49c66d8ed5dc2c5a74aa8a0
Merge: 02c4558 443e531
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri May 24 11:32:23 2019 +0200

    Merge branch 'feature/SLING-8428-mixin-linkedfile'

 core/pom.xml                                       |  6 ++++++
 .../testing/mock/sling/loader/ContentLoader.java   |  1 -
 .../mock/sling/loader/LoaderContentHandler.java    | 24 ++++++++++++++++------
 .../src/test/resources/SLING-INF/nodetypes/app.cnd | 10 +++++++++
 .../resources/json-import-samples/content.json     | 13 ++++++++++++
 5 files changed, 47 insertions(+), 7 deletions(-)