Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36932e46 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36932e46 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36932e46 Branch: refs/heads/master Commit: 36932e4637894a526ecf84ee5583292b5b379dde Parents: 20874f7 a193ea9 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Tue Nov 26 08:42:53 2013 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Tue Nov 26 08:42:53 2013 -0600 ---------------------------------------------------------------------- .../apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 9 +++++++++ .../apache/camel/component/rabbitmq/RabbitMQProducer.java | 5 +++-- .../camel/component/rabbitmq/RabbitMQConsumerIntTest.java | 2 ++ .../camel/test/blueprint/CamelBlueprintTestSupport.java | 4 ++-- parent/pom.xml | 6 +++--- 5 files changed, 19 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
