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/07 05:36:34 UTC

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

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

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

commit da8772b354eaa1e6bed8acebef8fc81decb03419
Merge: f1f1756 847710d
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Tue Apr 7 07:34:41 2020 +0200

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

 Jenkinsfile                                         |  8 ++++----
 .../base/connection/SerialChannelFactoryTest.java   |  2 ++
 .../org/apache/plc4x/test/RequirePcapCondition.java |  4 ++--
 .../apache/plc4x/test/RequirePcapNgCondition.java   |  4 ++--
 .../java/org/apache/plc4x/codegen/DFDLUtilTest.java |  8 ++++++--
 sandbox/plc4c/pom.xml                               |  2 +-
 sandbox/plc4cpp/pom.xml                             |  2 +-
 .../apache/plc4x/protocol/amsads/EndToEndTest.java  |  5 +++--
 .../org/apache/plc4x/protocol/df1/EndToEndTest.java |  3 ++-
 src/main/script/prerequisiteCheck.groovy            | 21 ++++++++++++++++++++-
 src/site/asciidoc/developers/preparing/linux.adoc   |  4 ++++
 src/site/asciidoc/developers/preparing/windows.adoc |  4 ++++
 tools/thrift/pom.xml                                |  2 +-
 13 files changed, 52 insertions(+), 17 deletions(-)