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

Posted to commits@celix.apache.org by ab...@apache.org on 2020/04/14 14:48:13 UTC

[celix] 01/01: Merge pull request #192 from apache/feature/scope_fixes

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

abroekhuis pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 4ed20be585098819b8177cca135362cf354149af
Merge: 0e63de9 87c1364
Author: Alexander Broekhuis <ab...@apache.org>
AuthorDate: Tue Apr 14 16:48:05 2020 +0200

    Merge pull request #192 from apache/feature/scope_fixes
    
    Fixed merge problems wrt scope usage.

 .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 51 ++++++++--------------
 .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c |  4 +-
 bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c    | 14 +++---
 .../src/pubsub_topology_manager.c                  | 36 +++++++--------
 4 files changed, 48 insertions(+), 57 deletions(-)