[plc4x] branch feature/osgi updated (f2db740 -> 5ee31f7)

[er...@apache.org]

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

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


    from f2db740  OSGi Module -Adapted S7 Feature generation
     add 2fe9929  Update opc-ua.adoc
     new 5ee31f7  Merge branches 'develop' and 'feature/osgi' of https://github.com/apache/plc4x into feature/osgi

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:
 src/site/asciidoc/users/protocols/opc-ua.adoc | 104 ++++++++++++++++++++++++--
 1 file changed, 99 insertions(+), 5 deletions(-)

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

[er...@apache.org]

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

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

commit 5ee31f7f005cf9beb0883e40b7ea85d52c0186f8
Merge: f2db740 2fe9929
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Tue May 12 08:55:58 2020 +0200

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

 src/site/asciidoc/users/protocols/opc-ua.adoc | 104 ++++++++++++++++++++++++--
 1 file changed, 99 insertions(+), 5 deletions(-)