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

Posted to commits@celix.apache.org by pe...@apache.org on 2022/03/04 04:54:33 UTC

[celix] 03/05: Merge branch 'master' into conan_support

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

pengzheng pushed a commit to branch feature/conan_support
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 8745fde2e658463b6eb34e270d705a36963b99d6
Merge: 9beae45 3b651da
Author: PengZheng <ho...@gmail.com>
AuthorDate: Thu Mar 3 23:11:11 2022 +0800

    Merge branch 'master' into conan_support

 libs/framework/gtest/src/bundle_context_services_test.cpp |  7 +++++--
 libs/framework/include/celix_bundle_context.h             |  9 +++++++--
 libs/framework/src/bundle_context.c                       | 10 ++++++++--
 libs/framework/src/service_registration.c                 | 11 +++++------
 4 files changed, 25 insertions(+), 12 deletions(-)