You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/09/27 13:23:32 UTC

[3/7] git commit: Merge branch 'master' of https://github.com/johnmshields/camel

Merge branch 'master' of https://github.com/johnmshields/camel


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ecaafc41
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ecaafc41
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ecaafc41

Branch: refs/heads/master
Commit: ecaafc4113291a9d7a1e90cb5aa7842b5dbe8023
Parents: 3eb922e 0a1cd14
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 27 13:22:00 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 27 13:22:00 2014 +0200

----------------------------------------------------------------------
 .../component/kafka/KafkaConfiguration.java     | 25 +++++++++++++++++--
 .../camel/component/kafka/KafkaConsumer.java    |  9 +++----
 .../camel/component/kafka/KafkaEndpoint.java    |  9 +++++++
 .../component/kafka/KafkaComponentTest.java     | 26 ++++++++++++++++++++
 .../component/kafka/KafkaConsumerTest.java      | 14 ++++++++---
 5 files changed, 71 insertions(+), 12 deletions(-)
----------------------------------------------------------------------