You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by ac...@apache.org on 2020/09/21 05:46:45 UTC

[camel-kafka-connector-examples] 01/02: A Merge branch 'master' of github.com:apache/camel-kafka-connector-examples

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

acosentino pushed a commit to branch move-after-read-fix
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git

commit c6c5e0697be492049db67a1cdf06ab0ff6abb113
Merge: 5309c1d e6ac6bb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 21 07:44:53 2020 +0200

    A
    Merge branch 'master' of github.com:apache/camel-kafka-connector-examples
    
    Conflicts:
    	aws2-s3/aws2-s3-move-after-read/config/openshift/aws2-s3-cred.properties
    	aws2-s3/aws2-s3-source/config/aws2-s3-cred.properties
    	aws2-s3/aws2-s3-source/config/openshift/aws2-s3-cred.properties

 aws2-s3/aws2-s3-move-after-read/README.adoc        | 35 ++++++++++++++++++++++
 .../config/openshift/aws2-s3-cred.properties       |  0
 .../config/openshift/aws2-s3-source-connector.yaml | 21 +++++++++++++
 3 files changed, 56 insertions(+)