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/27 13:58:07 UTC

[plc4x] 19/44: Merge branch 'feature/implement-logstash-integration' of https://github.com/stefah/plc4x into feature/implement-logstash-integration

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

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

commit 3238f703673660401a8ffcc7f95b0464008ea964
Merge: 794bcda eb74274
Author: Till Voss <ti...@codecentric.de>
AuthorDate: Thu Aug 15 14:27:40 2019 +0200

    Merge branch 'feature/implement-logstash-integration' of https://github.com/stefah/plc4x into feature/implement-logstash-integration

 plc4j/integrations/logstash-plugin/pom.xml         |  65 +++++++++----
 .../src/gem/lib/logstash-input-plc4x_jars.rb       |  21 ++++
 .../src/gem/lib/logstash/inputs/plc4x.rb           |  29 ++++++
 .../java/org/apache/plc4x/logstash/Plc4xInput.java | 108 ++++++++++++++-------
 ...vaInputExampleTest.java => Plc4xInputTest.java} |   4 +-
 5 files changed, 174 insertions(+), 53 deletions(-)