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

Posted to commits@plc4x.apache.org by na...@apache.org on 2020/01/28 23:08:14 UTC

[plc4x] 03/07: Merge remote-tracking branch 'origin/develop' into develop

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

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

commit 3cd9d999ac897611afcedfb64249e6d01561022a
Merge: 3d5ef14 6984ce1
Author: Matthias Milan Strljic <Ma...@googlemail.com>
AuthorDate: Tue Jan 28 21:35:11 2020 +0100

    Merge remote-tracking branch 'origin/develop' into develop

 .../hello-influx-data-collection/README.adoc       |  36 +++++
 .../example.properties                             |  32 +++++
 .../examples/hello-influx-data-collection/pom.xml  | 118 +++++++++++++++++
 .../java/examples/helloinflux/HelloInflux.java     | 145 +++++++++++++++++++++
 .../src/main/resources/logback.xml                 |  34 +++++
 plc4j/examples/pom.xml                             |   1 +
 .../PassiveBacNetIpConfiguration.java              |   2 +-
 .../protocol/PassiveBacNetIpProtocolLogic.java     |   7 +-
 8 files changed, 371 insertions(+), 4 deletions(-)