Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FFE2187B8 for ; Mon, 21 Mar 2016 08:34:45 +0000 (UTC) Received: (qmail 93160 invoked by uid 500); 21 Mar 2016 08:34:45 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 93105 invoked by uid 500); 21 Mar 2016 08:34:45 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 92992 invoked by uid 99); 21 Mar 2016 08:34:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 08:34:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12ADCDFA42; Mon, 21 Mar 2016 08:34:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@camel.apache.org Date: Mon, 21 Mar 2016 08:34:45 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] camel git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fea69048 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fea69048 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fea69048 Branch: refs/heads/master Commit: fea6904897a992bd9311745baae1c716c65a10e4 Parents: 9916a00 5207d82 Author: Freeman Fang Authored: Mon Mar 21 16:22:57 2016 +0800 Committer: Freeman Fang Committed: Mon Mar 21 16:22:57 2016 +0800 ---------------------------------------------------------------------- .../component/kafka/KafkaConfiguration.java | 14 +++++++++ .../camel/component/kafka/KafkaConsumer.java | 14 ++++++++- .../camel/component/kafka/KafkaEndpoint.java | 9 ++++++ .../component/kafka/KafkaConsumerFullTest.java | 31 +++++++++++++++++++- .../camel/swagger/RestSwaggerSupport.java | 4 +-- 5 files changed, 68 insertions(+), 4 deletions(-) ----------------------------------------------------------------------