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/02 07:07:02 UTC

[plc4x] branch camel updated (e365650 -> c370a0d)

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

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


    from e365650  Driver and Camel parameter can now be used together in same URI
     add a166fc9  - Updated the used download-maven-plugin to 1.5.0
     add 893d4fe  - Fine tuned some execution names - Disabled the "proxy protocol" extraction
     new c370a0d  Merge branch 'develop' of https://github.com/apache/plc4x into camel

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 plc4j/integrations/logstash-plugin/pom.xml | 1 -
 pom.xml                                    | 2 +-
 sandbox/plc4cpp/pom.xml                    | 9 ++++-----
 tools/boost/pom.xml                        | 1 -
 tools/logstash/pom.xml                     | 1 -
 tools/thrift/pom.xml                       | 1 -
 6 files changed, 5 insertions(+), 10 deletions(-)


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

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c370a0d13b482a83b3a570b68eaa315670b5ce51
Merge: e365650 893d4fe
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Thu Apr 2 09:06:22 2020 +0200

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

 plc4j/integrations/logstash-plugin/pom.xml | 1 -
 pom.xml                                    | 2 +-
 sandbox/plc4cpp/pom.xml                    | 9 ++++-----
 tools/boost/pom.xml                        | 1 -
 tools/logstash/pom.xml                     | 1 -
 tools/thrift/pom.xml                       | 1 -
 6 files changed, 5 insertions(+), 10 deletions(-)