[camel] branch master updated (d5af3f7 -> cb256f5)

[da...@apache.org]

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

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


    from d5af3f7  CAMEL-13164: camel3 - Remove includeRoutes on RouteBuilder
     new 7512546  Polished
     new cb256f5  camel3 - Avoid clash of <custom> in XML DSL so fixed the TODO by renaming the load balancer

The 35308 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:
 MIGRATION.md                                                        | 4 ++++
 .../camel/spring/processor/SpringCustomRefLoadBalanceTest.xml       | 2 +-
 .../src/main/java/org/apache/camel/impl/AbstractCamelContext.java   | 6 ------
 .../src/main/java/org/apache/camel/model/LoadBalanceDefinition.java | 3 +--
 .../src/main/java/org/apache/camel/model/MarshalDefinition.java     | 3 ---
 .../src/main/java/org/apache/camel/model/UnmarshalDefinition.java   | 1 -
 .../org/apache/camel/model/dataformat/DataFormatsDefinition.java    | 1 -
 .../camel/model/transformer/DataFormatTransformerDefinition.java    | 1 -
 8 files changed, 6 insertions(+), 15 deletions(-)