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/01/09 22:18:14 UTC

[celix] 01/01: Merge branch 'master' into develop

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

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

commit 29ce072f699fb9bc5096b4402b1af68e5db8af4f
Merge: d3f2b3b 85ef063
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Thu Jan 9 23:17:45 2020 +0100

    Merge branch 'master' into develop

 .github/workflows/build.yml                        |   3 +-
 BUILDING                                           |   2 +-
 CHANGES.md                                         | 470 +++++++++++----------
 Doxyfile                                           |  17 +
 KEYS                                               | 107 ++---
 RELEASE_NOTES                                      |  34 +-
 .../log_writer/log_writer_stdout/CMakeLists.txt    |   2 +-
 .../log_writer/log_writer_syslog/CMakeLists.txt    |   2 +-
 bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt     |   2 +-
 bundles/pubsub/pubsub_discovery/CMakeLists.txt     |   2 +-
 .../pubsub_serializer_avrobin/CMakeLists.txt       |   2 +-
 .../pubsub/pubsub_serializer_json/CMakeLists.txt   |   2 +-
 .../pubsub/pubsub_topology_manager/CMakeLists.txt  |   2 +-
 libs/etcdlib/CMakeLists.txt                        |   2 +-
 rat-excludes.txt                                   |   9 +-
 15 files changed, 356 insertions(+), 302 deletions(-)