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

Posted to commits@camel.apache.org by he...@apache.org on 2013/12/25 21:12:30 UTC

[2/2] 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/88f35997
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88f35997
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88f35997

Branch: refs/heads/master
Commit: 88f35997e27302e22647095c0c897f43c4539c72
Parents: d687475 51088fe
Author: Henryk Konsek <he...@gmail.com>
Authored: Wed Dec 25 21:02:28 2013 +0100
Committer: Henryk Konsek <he...@gmail.com>
Committed: Wed Dec 25 21:02:28 2013 +0100

----------------------------------------------------------------------
 .../component/aws/sqs/SqsConfiguration.java     | 33 +++++++++++------
 .../camel/component/aws/sqs/SqsEndpoint.java    |  7 +++-
 .../aws/sqs/SqsComponentConfigurationTest.java  |  5 ++-
 .../camel/dataformat/csv/CsvDataFormat.java     | 20 +++++++++-
 .../camel/dataformat/csv/CsvIteratorTest.java   |  8 ++--
 .../apache/camel/component/jcr/JcrProducer.java | 39 ++++++++++++++------
 .../jcr/AuthTokenLoginFailureTest.java          |  4 +-
 .../jcr/JcrAuthTokenWithLoginTest.java          |  4 +-
 .../camel/component/jcr/JcrGetNodeByIdTest.java |  4 +-
 .../component/jcr/JcrNodePathCreationTest.java  |  4 +-
 .../component/jcr/JcrProducerSubNodeTest.java   |  4 +-
 .../camel/component/jcr/JcrProducerTest.java    |  4 +-
 .../camel/component/quartz/QuartzComponent.java |  5 +++
 .../component/quartz2/QuartzComponent.java      |  6 ++-
 14 files changed, 103 insertions(+), 44 deletions(-)
----------------------------------------------------------------------