This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master-for-0.8.0
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 55e21bc86511f86da4d1ae278d7ecb67a14c10a5
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Feb 16 13:56:37 2021 +0100
Regen
---
.../docs/camel-jclouds-kafka-sink-connector.adoc | 4 ----
.../docs/camel-jclouds-kafka-source-connector.adoc | 4 ----
.../docs/camel-jsonata-kafka-sink-connector.adoc | 4 ----
docs/modules/ROOT/nav.adoc | 21 ---------------------
.../camel-jclouds-kafka-sink-connector.adoc | 4 ----
.../camel-jclouds-kafka-source-connector.adoc | 4 ----
.../camel-jsonata-kafka-sink-connector.adoc | 4 ----
7 files changed, 45 deletions(-)
diff --git
a/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-sink-connector.adoc
b/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-sink-connector.adoc
index 11df96a..153358b 100644
---
a/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-sink-connector.adoc
+++
b/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-sink-connector.adoc
@@ -2,11 +2,7 @@
[[camel-jclouds-kafka-connector-sink]]
= camel-jclouds-kafka-connector sink configuration
-<<<<<<< HEAD
-Connector Description: Interact with jclouds compute & blobstore service.
-=======
Connector Description: Interact with jclouds compute and blobstore service.
->>>>>>> camel-master
When using camel-jclouds-kafka-connector as sink make sure to use the
following Maven dependency to have support for the connector:
diff --git
a/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-source-connector.adoc
b/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-source-connector.adoc
index 7e89348..2e940df 100644
---
a/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-source-connector.adoc
+++
b/connectors/camel-jclouds-kafka-connector/src/main/docs/camel-jclouds-kafka-source-connector.adoc
@@ -2,11 +2,7 @@
[[camel-jclouds-kafka-connector-source]]
= camel-jclouds-kafka-connector source configuration
-<<<<<<< HEAD
-Connector description: Interact with jclouds compute & blobstore service.
-=======
Connector description: Interact with jclouds compute and blobstore service.
->>>>>>> camel-master
When using camel-jclouds-kafka-connector as source make sure to use the
following Maven dependency to have support for the connector:
diff --git
a/connectors/camel-jsonata-kafka-connector/src/main/docs/camel-jsonata-kafka-sink-connector.adoc
b/connectors/camel-jsonata-kafka-connector/src/main/docs/camel-jsonata-kafka-sink-connector.adoc
index 1e98beb..f181fff 100644
---
a/connectors/camel-jsonata-kafka-connector/src/main/docs/camel-jsonata-kafka-sink-connector.adoc
+++
b/connectors/camel-jsonata-kafka-connector/src/main/docs/camel-jsonata-kafka-sink-connector.adoc
@@ -2,11 +2,7 @@
[[camel-jsonata-kafka-connector-sink]]
= camel-jsonata-kafka-connector sink configuration
-<<<<<<< HEAD
-Connector Description: JSON to JSON transformation using JSONATA.
-=======
Connector Description: Transforms JSON payload using JSONata transformation.
->>>>>>> camel-master
When using camel-jsonata-kafka-connector as sink make sure to use the
following Maven dependency to have support for the connector:
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index ddb8488..ba70c20 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -170,12 +170,9 @@
** camel-azure-storage-blob-kafka-connector
***
xref:connectors/camel-azure-storage-blob-kafka-source-connector.adoc[Source
Docs]
*** xref:connectors/camel-azure-storage-blob-kafka-sink-connector.adoc[Sink
Docs]
-<<<<<<< HEAD
-=======
** camel-azure-storage-datalake-kafka-connector
***
xref:connectors/camel-azure-storage-datalake-kafka-source-connector.adoc[Source
Docs]
***
xref:connectors/camel-azure-storage-datalake-kafka-sink-connector.adoc[Sink
Docs]
->>>>>>> camel-master
** camel-azure-storage-queue-kafka-connector
***
xref:connectors/camel-azure-storage-queue-kafka-source-connector.adoc[Source
Docs]
*** xref:connectors/camel-azure-storage-queue-kafka-sink-connector.adoc[Sink
Docs]
@@ -412,11 +409,8 @@
*** xref:connectors/camel-http-kafka-sink-connector.adoc[Sink Docs]
** camel-https-kafka-connector
*** xref:connectors/camel-https-kafka-sink-connector.adoc[Sink Docs]
-<<<<<<< HEAD
-=======
** camel-hwcloud-smn-kafka-connector
*** xref:connectors/camel-hwcloud-smn-kafka-sink-connector.adoc[Sink Docs]
->>>>>>> camel-master
** camel-iec60870-client-kafka-connector
*** xref:connectors/camel-iec60870-client-kafka-source-connector.adoc[Source
Docs]
*** xref:connectors/camel-iec60870-client-kafka-sink-connector.adoc[Sink Docs]
@@ -445,12 +439,9 @@
** camel-imaps-kafka-connector
*** xref:connectors/camel-imaps-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-imaps-kafka-sink-connector.adoc[Sink Docs]
-<<<<<<< HEAD
-=======
** camel-infinispan-embedded-kafka-connector
***
xref:connectors/camel-infinispan-embedded-kafka-source-connector.adoc[Source
Docs]
*** xref:connectors/camel-infinispan-embedded-kafka-sink-connector.adoc[Sink
Docs]
->>>>>>> camel-master
** camel-infinispan-kafka-connector
*** xref:connectors/camel-infinispan-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-infinispan-kafka-sink-connector.adoc[Sink Docs]
@@ -518,12 +509,9 @@
** camel-kafka-kafka-connector
*** xref:connectors/camel-kafka-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-kafka-kafka-sink-connector.adoc[Sink Docs]
-<<<<<<< HEAD
-=======
** camel-kamelet-kafka-connector
*** xref:connectors/camel-kamelet-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-kamelet-kafka-sink-connector.adoc[Sink Docs]
->>>>>>> camel-master
** camel-kubernetes-config-maps-kafka-connector
***
xref:connectors/camel-kubernetes-config-maps-kafka-sink-connector.adoc[Sink
Docs]
** camel-kubernetes-custom-resources-kafka-connector
@@ -667,12 +655,9 @@
** camel-paho-kafka-connector
*** xref:connectors/camel-paho-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-paho-kafka-sink-connector.adoc[Sink Docs]
-<<<<<<< HEAD
-=======
** camel-paho-mqtt5-kafka-connector
*** xref:connectors/camel-paho-mqtt5-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-paho-mqtt5-kafka-sink-connector.adoc[Sink Docs]
->>>>>>> camel-master
** camel-pdf-kafka-connector
*** xref:connectors/camel-pdf-kafka-sink-connector.adoc[Sink Docs]
** camel-pg-replication-slot-kafka-connector
@@ -802,12 +787,9 @@
*** xref:connectors/camel-spring-integration-kafka-sink-connector.adoc[Sink
Docs]
** camel-spring-ldap-kafka-connector
*** xref:connectors/camel-spring-ldap-kafka-sink-connector.adoc[Sink Docs]
-<<<<<<< HEAD
-=======
** camel-spring-rabbitmq-kafka-connector
*** xref:connectors/camel-spring-rabbitmq-kafka-source-connector.adoc[Source
Docs]
*** xref:connectors/camel-spring-rabbitmq-kafka-sink-connector.adoc[Sink Docs]
->>>>>>> camel-master
** camel-spring-redis-kafka-connector
*** xref:connectors/camel-spring-redis-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-spring-redis-kafka-sink-connector.adoc[Sink Docs]
@@ -824,11 +806,8 @@
*** xref:connectors/camel-ssh-kafka-sink-connector.adoc[Sink Docs]
** camel-stax-kafka-connector
*** xref:connectors/camel-stax-kafka-sink-connector.adoc[Sink Docs]
-<<<<<<< HEAD
-=======
** camel-stitch-kafka-connector
*** xref:connectors/camel-stitch-kafka-sink-connector.adoc[Sink Docs]
->>>>>>> camel-master
** camel-stomp-kafka-connector
*** xref:connectors/camel-stomp-kafka-source-connector.adoc[Source Docs]
*** xref:connectors/camel-stomp-kafka-sink-connector.adoc[Sink Docs]
diff --git
a/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-sink-connector.adoc
b/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-sink-connector.adoc
index 11df96a..153358b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-sink-connector.adoc
@@ -2,11 +2,7 @@
[[camel-jclouds-kafka-connector-sink]]
= camel-jclouds-kafka-connector sink configuration
-<<<<<<< HEAD
-Connector Description: Interact with jclouds compute & blobstore service.
-=======
Connector Description: Interact with jclouds compute and blobstore service.
->>>>>>> camel-master
When using camel-jclouds-kafka-connector as sink make sure to use the
following Maven dependency to have support for the connector:
diff --git
a/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-source-connector.adoc
b/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-source-connector.adoc
index 7e89348..2e940df 100644
---
a/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-source-connector.adoc
+++
b/docs/modules/ROOT/pages/connectors/camel-jclouds-kafka-source-connector.adoc
@@ -2,11 +2,7 @@
[[camel-jclouds-kafka-connector-source]]
= camel-jclouds-kafka-connector source configuration
-<<<<<<< HEAD
-Connector description: Interact with jclouds compute & blobstore service.
-=======
Connector description: Interact with jclouds compute and blobstore service.
->>>>>>> camel-master
When using camel-jclouds-kafka-connector as source make sure to use the
following Maven dependency to have support for the connector:
diff --git
a/docs/modules/ROOT/pages/connectors/camel-jsonata-kafka-sink-connector.adoc
b/docs/modules/ROOT/pages/connectors/camel-jsonata-kafka-sink-connector.adoc
index 1e98beb..f181fff 100644
--- a/docs/modules/ROOT/pages/connectors/camel-jsonata-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-jsonata-kafka-sink-connector.adoc
@@ -2,11 +2,7 @@
[[camel-jsonata-kafka-connector-sink]]
= camel-jsonata-kafka-connector sink configuration
-<<<<<<< HEAD
-Connector Description: JSON to JSON transformation using JSONATA.
-=======
Connector Description: Transforms JSON payload using JSONata transformation.
->>>>>>> camel-master
When using camel-jsonata-kafka-connector as sink make sure to use the
following Maven dependency to have support for the connector:
