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

Posted to commits@plc4x.apache.org by er...@apache.org on 2020/04/08 10:37:13 UTC

[plc4x] 01/02: Merge branches 'develop' and 'feature/osgi' of https://github.com/apache/plc4x into feature/osgi

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

erobinet pushed a commit to branch feature/osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit d71558f9918693f7b5307adaad6721972208fff7
Merge: e1a11a7 d40333d
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Wed Apr 8 08:09:47 2020 +0200

    Merge branches 'develop' and 'feature/osgi' of https://github.com/apache/plc4x into feature/osgi

 .../plc4x/java/spi/connection/NettyChannelFactory.java       | 11 +++++++++--
 .../org/apache/plc4x/java/spi/generation/ReadBuffer.java     |  2 +-
 .../src/main/java/io/netty/bootstrap/EmbeddedBootstrap.java} | 12 ++++--------
 .../src/main/java/io/netty/bootstrap/EventLoopProvider.java  |  0
 .../apache/plc4x/java/transport/test/TestChannelFactory.java |  8 ++++++--
 5 files changed, 20 insertions(+), 13 deletions(-)