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 2017/12/26 14:28:26 UTC

[incubator-plc4x] branch master updated (a620f5d -> 318d321)

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

cdutz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.


    from a620f5d  Added License information on the resources used in the site generation
     add 71c8a96  NO JIRA: Right now the site generation generates a lot of timestamps in the output. This causes problems with the gitpubsub system. This is an attempt to rid the output of these timestamps and hereby make the updates to the asf-site branch more readable.
     new 318d321  Merge branches 'feature/fine-tuned-site-generation' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x

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:
 pom.xml                                            |   18 +-
 .../site/asciidoc/development/building.adoc        |    7 +-
 .../site/asciidoc/development/ci.adoc              |    5 +-
 .../site/asciidoc/development/contributing.adoc    |    5 +-
 src/site/site.xml                                  |    6 +
 src/site/template/maven-site.vm                    | 1786 ++++++++++++++++++++
 6 files changed, 1814 insertions(+), 13 deletions(-)
 copy integrations/apache-camel/src/main/docs/PLC4X.adoc => src/site/asciidoc/development/building.adoc (88%)
 copy integrations/apache-camel/src/main/docs/PLC4X.adoc => src/site/asciidoc/development/ci.adoc (88%)
 copy integrations/apache-camel/src/main/docs/PLC4X.adoc => src/site/asciidoc/development/contributing.adoc (88%)
 create mode 100644 src/site/template/maven-site.vm

-- 
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].

[incubator-plc4x] 01/01: Merge branches 'feature/fine-tuned-site-generation' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x

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

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

commit 318d321fb348570abdf607ac20637131d08ee55c
Merge: a620f5d 71c8a96
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Dec 26 15:27:46 2017 +0100

    Merge branches 'feature/fine-tuned-site-generation' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x

 pom.xml                                         |   18 +-
 src/site/asciidoc/development/building.adoc     |   21 +
 src/site/asciidoc/development/ci.adoc           |   19 +
 src/site/asciidoc/development/contributing.adoc |   19 +
 src/site/site.xml                               |    6 +
 src/site/template/maven-site.vm                 | 1786 +++++++++++++++++++++++
 6 files changed, 1868 insertions(+), 1 deletion(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.