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

Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/08/07 08:48:00 UTC

[plc4x] 13/17: Merge branch 'develop' of https://github.com/apache/plc4x into implement-df1-protocol

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

cdutz pushed a commit to branch feature/implement-df1-driver
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 89ee201ca710968e045f17c935c20622972cec5f
Merge: a3dc7f3 38d414a
Author: v.emmert <v....@pragmaticminds.de>
AuthorDate: Tue Aug 6 11:03:10 2019 +0200

    Merge branch 'develop' of https://github.com/apache/plc4x into implement-df1-protocol

 plc4j/drivers/opcua/pom.xml                        |  6 +++---
 .../opcua/connection/OpcuaTcpPlcConnection.java    |  2 +-
 .../base/connection/TcpSocketChannelFactory.java   | 25 +++++++++++++++++++---
 src/site/asciidoc/index.adoc                       |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)