[camel] branch master updated: CAMEL-15098 - camel-3x-upgrade-guide-3_4.adoc malformed

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: CAMEL-15098 - camel-3x-upgrade-guide-3_4.adoc malformed

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

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 840aa98  CAMEL-15098 - camel-3x-upgrade-guide-3_4.adoc malformed
840aa98 is described below

commit 840aa981fda5bc1c74bef05b4338fac69275308f
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri May 22 12:32:03 2020 +0200

    CAMEL-15098 - camel-3x-upgrade-guide-3_4.adoc malformed
---
 .../modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc       | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
index 05a0844..c234d31 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
@@ -5,19 +5,7 @@ from Camel 3.x to 3.y. For example if you are upgrading Camel 3.0 to 3.2, then y
 from both 3.0 to 3.1 and 3.1 to 3.2.
 
 == Upgrading Camel 3.3 to 3.4
-
-<<<<<<< HEAD
 =======
-=== camel-servlet and camel-http-common
-HttpRegistry and DefaultHttpRegistry classes from camel-servlet are moved from camel-servlet into camel-http-common.
-HttpRegistryProvider is added and used in DefaultHttpRegistry instead of CamelServlet which is implementing HttpRegistryProvider
-since DefaultHttpRegistry is used in camel-resteasy component where CamelResteasy servlet also implementing HttpRegistryProvider.
-
-These changes had effects on camel-atmosphere-websocket and camel-servlet and also camel-resteasy.
-Users of these components where they would have custom implemetations on DefaultHttpRegistry and using CamelServlet class should
-take this change into account.
-
->>>>>>> 282044701e9... [CAMEL-7810] Fix JdbcAggregationRepository optimistic locking feature
 === camel-test and JMX
 
 The `camel-test` module no longer has dependency on `camel-management` out of the box.