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 9beae45e9aa29551ee13ceef7578f9346a101947 Merge: 58a2f88 0a6e55b Author: PengZheng <[email protected]> AuthorDate: Tue Mar 1 20:04:47 2022 +0800 Merge branch 'master' into conan_support .../remote_service_admin_dfi/gtest/CMakeLists.txt | 2 + .../gtest/exception_test_service.descriptor | 9 ++ .../gtest/src/rsa_client_server_tests.cc | 175 +++++++++++++++++++++ .../gtest/src/tst_activator.c | 2 +- .../src/export_registration_dfi.c | 9 +- .../src/export_registration_dfi.h | 2 +- .../src/import_registration_dfi.c | 30 +++- .../src/import_registration_dfi.h | 2 +- .../src/remote_service_admin_dfi.c | 11 +- .../rsa_common/src/remote_interceptors_handler.c | 3 +- libs/dfi/gtest/src/json_rpc_avpr_tests.cpp | 8 +- libs/dfi/gtest/src/json_rpc_tests.cpp | 88 ++++++++++- libs/dfi/include/json_rpc.h | 2 +- libs/dfi/src/json_rpc.c | 80 +++++----- libs/utils/include/celix_errno.h | 95 +++++++++-- 15 files changed, 446 insertions(+), 72 deletions(-)
