(camel) branch kamelet-no updated: CAMEL-19411: camel-kamelet - Kamelets should be as its a single component, and not a route with its own error handling. Therefore we turn off error handling in the template to make it work better with user configured error handling. Added option to be backwards compatible

[da...@apache.org]

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

davsclaus pushed a commit to branch kamelet-no
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/kamelet-no by this push:
     new 27ac8112fbb CAMEL-19411: camel-kamelet - Kamelets should be as its a single component, and not a route with its own error handling. Therefore we turn off error handling in the template to make it work better with user configured error handling. Added option to be backwards compatible
27ac8112fbb is described below

commit 27ac8112fbb2f4c099619541c8bccb8441bf4a89
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 26 11:58:38 2023 +0100

    CAMEL-19411: camel-kamelet - Kamelets should be as its a single component, and not a route with its own error handling. Therefore we turn off error handling in the template to make it work better with user configured error handling. Added option to be backwards compatible
---
 docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
index 7ca454a86d8..8ef7de53067 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
@@ -421,8 +421,6 @@ The command `camel dependencies` has been renamed to `camel dependency`.
 
 In Camel JBang the `-dir` parameter for `init` and `run` goal has been renamed to require 2 dashes `--dir` like all the other options.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 The `camel stop` command will now by default stop all running integrations (the option `--all` has been removed).
 
 The _Placeholders substitutes_ is changed to use `#name` instead of `$name` syntax.