You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/11/23 05:04:09 UTC

[karaf-site] branch trunk updated (915e82f -> f255a85)

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

jbonofre pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/karaf-site.git.


    from 915e82f  Merge pull request #22 from fpapon/KARAF-WHIMSY
     add 156d3f5  Add ACNA2018 slideshow
     new f255a85  Merge pull request #24 from apache/KARAF-ACON-2018

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/main/webapp/images/apache-karaf-ac-2018.png       | Bin 0 -> 298560 bytes
 src/main/webapp/index.html                            |  14 ++++++++++++++
 .../acna18-apache-karaf-in-the-enterprise.pdf         | Bin 0 -> 2118333 bytes
 3 files changed, 14 insertions(+)
 create mode 100644 src/main/webapp/images/apache-karaf-ac-2018.png
 create mode 100644 src/main/webapp/resources/acna18-apache-karaf-in-the-enterprise.pdf


[karaf-site] 01/01: Merge pull request #24 from apache/KARAF-ACON-2018

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

jbonofre pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/karaf-site.git

commit f255a85499e7ecc62dbc21a98fe19527bd96fe1c
Merge: 915e82f 156d3f5
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Nov 23 06:04:05 2018 +0100

    Merge pull request #24 from apache/KARAF-ACON-2018
    
    Add ACNA2018 slideshow

 src/main/webapp/images/apache-karaf-ac-2018.png       | Bin 0 -> 298560 bytes
 src/main/webapp/index.html                            |  14 ++++++++++++++
 .../acna18-apache-karaf-in-the-enterprise.pdf         | Bin 0 -> 2118333 bytes
 3 files changed, 14 insertions(+)