You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2020/04/23 19:15:46 UTC
[celix] 01/02: Merge remote-tracking branch
'remotes/origin/develop' into feature/pubsub_custom_serializers
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/pubsub_custom_serializers
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 7127246630de237b05f140cba6bd4baa09e9809d
Merge: 13fe9f8 d9b2c6d
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Thu Apr 23 21:02:04 2020 +0200
Merge remote-tracking branch 'remotes/origin/develop' into feature/pubsub_custom_serializers
# Conflicts:
# .github/workflows/build.yml
# cmake/celix_project/CelixProject.cmake
.github/workflows/build.yml | 88 ----
.github/workflows/coverage.yml | 49 ++
.github/workflows/macos.yml | 41 ++
.github/workflows/ubuntu.yml | 76 +++
.travis.yml | 6 +-
bundles/http_admin/test/CMakeLists.txt | 2 +-
bundles/pubsub/CMakeLists.txt | 18 +-
.../interceptors/src/ps_interceptor_activator.c | 28 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 7 +-
.../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 137 +++++-
.../src/pubsub_tcp_topic_receiver.c | 6 +-
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 15 +-
.../src/pubsub_udpmc_topic_receiver.c | 55 ++-
.../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 57 ++-
.../pubsub_protocol_wire_v1/gtest/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 4 +-
.../pubsub_spi/src/pubsub_interceptors_handler.c | 3 +-
.../src/pubsub_topology_manager.c | 28 +-
bundles/pubsub/test/CMakeLists.txt | 14 +-
bundles/pubsub/test/test/test_endpoint_runner.cc | 12 +-
.../remote_service_admin_dfi/gtest/CMakeLists.txt | 2 +-
.../private/test/CMakeLists.txt | 2 +-
.../topology_manager/tms_tst/CMakeLists.txt | 2 +-
bundles/shell/shell/test/CMakeLists.txt | 2 +-
cmake/celix_project/CelixProject.cmake | 8 +-
cmake/celix_project/CodeCoverage.cmake | 75 +--
libs/dfi/gtest/CMakeLists.txt | 2 +-
libs/framework/CMakeLists.txt | 40 +-
libs/framework/gtest/CMakeLists.txt | 2 +-
libs/framework/src/service_tracker.c | 22 +-
libs/utils/CMakeLists.txt | 26 +-
libs/utils/private/test/thread_pool_test.cpp | 120 -----
libs/utils/src/thpool.c | 535 ---------------------
.../bundles/config_admin/CMakeLists.txt | 2 +-
.../config_admin/config_admin_tst/CMakeLists.txt | 2 +-
35 files changed, 542 insertions(+), 948 deletions(-)
diff --cc .github/workflows/build.yml
index a0c3abd,0000000..e69de29
mode 100644,000000..100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml