This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/type_support_for_properties in repository https://gitbox.apache.org/repos/asf/celix.git
commit 1ce505d3762b57371fca0a137c1f9f01ba451fc3 Merge: c15bf710 2ccce27a Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Jan 8 22:30:02 2023 +0100 Merge remote-tracking branch 'origin/master' into feature/type_support_for_properties # Conflicts: # bundles/pubsub/pubsub_protocol/pubsub_protocol_lib/src/pubsub_wire_protocol_common.c CMakeLists.txt | 8 +- bundles/deployment_admin/src/deployment_admin.c | 28 +-- .../log_service_api/include/celix_log_service.h | 36 ++- .../gtest/src/SyslogWriterTestSuite.cc | 2 +- .../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 14 +- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 15 +- .../pubsub_protocol_lib/gtest/CMakeLists.txt | 12 +- .../gtest/src/PS_WP_common_tests.cc | 280 +++++++++++++++++++-- .../pubsub_protocol_lib/gtest/src/main.cc | 26 -- .../include/pubsub_wire_protocol_common.h | 22 +- .../src/pubsub_wire_protocol_common.c | 195 +++++++------- .../gtest/src/PS_WP_tests.cc | 39 ++- .../src/pubsub_wire_protocol_impl.c | 8 +- .../src/pubsub_wire_protocol_impl.h | 2 +- .../gtest/src/PS_WP_v2_tests.cc | 60 +++++ .../src/pubsub_wire_v2_protocol_impl.c | 12 +- .../src/pubsub_wire_v2_protocol_impl.h | 2 +- .../pubsub/pubsub_spi/include/pubsub_protocol.h | 88 ++++--- .../include/endpoint_discovery_server.h | 2 +- .../discovery_common/src/discovery_activator.c | 27 +- .../src/endpoint_discovery_server.c | 15 +- .../discovery_etcd/src/etcd_watcher.c | 2 +- .../discovery_shm/src/discovery_shmWatcher.c | 2 +- .../tms_tst/disc_mock/disc_mock_activator.c | 25 +- .../src/DynamicConsumerBundleActivator.cc | 2 +- libs/dfi/src/avrobin_serializer.c | 6 +- libs/framework/include/celix/BundleActivator.h | 2 +- libs/framework/include/celix/BundleContext.h | 24 +- libs/framework/include/celix_bundle_context.h | 12 +- libs/framework/include/celix_log.h | 30 ++- libs/framework/src/bundle_context.c | 2 +- libs/framework/src/celix_log.c | 2 +- libs/framework/src/framework.c | 6 +- libs/utils/include/celix_log_utils.h | 54 ++-- libs/utils/private/test/array_list_test.cpp | 4 +- libs/utils/private/test/hash_map_test.cpp | 5 +- libs/utils/src/version_range.c | 34 +-- 37 files changed, 743 insertions(+), 362 deletions(-)
