This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch release-2.4.0
in repository https://gitbox.apache.org/repos/asf/celix.git
commit a6bbbac0da3102b1f53d6c512aa6d7b119999153
Merge: 27a9e552 dfe99e75
Author: Pepijn Noltes <pepijnnol...@gmail.com>
AuthorDate: Wed Sep 27 19:03:19 2023 +0200
Merge branch 'master' into release-2.4.0
.github/workflows/ubuntu.yml | 12 ++++++----
.../admin/src/RemoteServiceAdmin.cc | 1 +
.../src/RemoteServicesIntegrationTestSuite.cc | 4 ++--
bundles/pubsub/integration/CMakeLists.txt | 5 ++--
.../integration/gtest/PubSubWebsocketTestMain.cc | 28 ++++++++++++++++++++++
.../remote_service_admin_dfi/gtest/CMakeLists.txt | 6 +++++
.../remote_service_admin_dfi/gtest/src/main.cc | 3 +++
.../topology_manager/tms_tst/CMakeLists.txt | 4 ++++
.../topology_manager/tms_tst/main.cc | 3 +++
conanfile.py | 6 +++--
.../framework/gtest/src/ScheduledEventTestSuite.cc | 8 +++----
11 files changed, 65 insertions(+), 15 deletions(-)
