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 e11c3efe2ba88e90fac746bc7917317f6c33bff0
Merge: 3e42580 9f116ff
Author: sseifert <sseif...@pro-vision.de>
AuthorDate: Wed Nov 8 18:29:49 2017 +0100
Merge branch 'SLING-7233'
.../sling/testing/mock/osgi/MapMergeUtil.java | 17 ++++++-----
.../sling/testing/mock/osgi/OsgiMetadataUtil.java | 22 +++++++++++++-
.../mock/osgi/MockConfigurationAdminTest.java | 35 ++++++++++++++++++++++
src/test/resources/OSGI-INF/serviceComponents.xml | 18 +++++++++--
4 files changed, 81 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
