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

Posted to commits@plc4x.apache.org by ot...@apache.org on 2021/01/06 21:43:06 UTC

[plc4x] 12/17: Merge branch 'develop' of https://github.com/apache/plc4x into develop

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

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

commit 3fc25a54f1c3df0c91272acdef9c13d8ec314d26
Merge: 8622c94 659d6b8
Author: ottlukas <ot...@gmail.com>
AuthorDate: Sun Sep 20 17:27:20 2020 +0200

    Merge branch 'develop' of https://github.com/apache/plc4x into develop

 RELEASE_NOTES                                      |  12 ++-
 .../java/abeth/protocol/AbEthProtocolLogic.java    |   6 +-
 .../plc4x/java/ads/protocol/AdsProtocolLogic.java  |  21 ++--
 .../java/modbus/protocol/ModbusProtocolLogic.java  |   4 +-
 .../s7/readwrite/protocol/S7ProtocolLogic.java     |   9 ++
 .../connectionpool/PooledPlcDriverManager.java     |   2 +-
 pom.xml                                            |   2 +-
 src/site/asciidoc/users/protocols/modbus.adoc      | 119 +++++++++++++++++----
 8 files changed, 136 insertions(+), 39 deletions(-)