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 2018/07/31 10:28:11 UTC

[sling-org-apache-sling-testing-osgi-mock] 01/03: Merge branch 'master' into dynamic-reference-properties

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-osgi-mock.git

commit f930425046b5712eb0829537649a9374796e4d80
Merge: 616be71 bf71f40
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 12:06:07 2018 +0200

    Merge branch 'master' into dynamic-reference-properties

 README.md                                          |  4 +++
 pom.xml                                            | 10 +++++++
 .../testing/mock/osgi/MockServiceRegistration.java |  8 +++---
 .../mock/osgi/context/OsgiContextImplTest.java     | 33 ++++++++++++++++++++++
 ...sting.mock.osgi.context.OsgiContextImplTest.xml | 27 ++++++++++++++++++
 5 files changed, 78 insertions(+), 4 deletions(-)