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

Posted to commits@camel.apache.org by ff...@apache.org on 2021/12/21 15:11:04 UTC

[camel] 04/09: Merge branch 'main' of github.com:apache/camel into main

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

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

commit 4878a95685ffc2b0ace89018c4cc570e98168232
Merge: e9f6f08 6ea85fd
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Nov 4 15:10:37 2021 -0400

    Merge branch 'main' of github.com:apache/camel into main

 .../camel/component/aws2/sqs/Sqs2Producer.java     | 95 ++++++++++++----------
 .../SqsProducerSendLocalstackMaxAttributesIT.java  | 76 +++++++++++++++++
 .../TelegramConsumerHealthCheckErrorTest.java      | 12 ++-
 .../TelegramConsumerHealthCheckOkTest.java         |  2 -
 .../camel/catalog/impl/AbstractCamelCatalog.java   |  1 -
 .../org/apache/camel/model/SagaDefinition.java     |  5 --
 .../apache/camel/processor/saga/SagaProcessor.java |  3 -
 .../camel/support/ScheduledPollConsumer.java       | 27 +++++-
 .../support/ScheduledPollConsumerHealthCheck.java  | 13 ++-
 .../ROOT/pages/camel-3x-upgrade-guide-3_13.adoc    |  4 +
 .../modules/ROOT/pages/health-check.adoc           |  6 +-
 11 files changed, 180 insertions(+), 64 deletions(-)