Merge branch 'CAMEL-7756' of https://github.com/kevinearls/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ecf83c1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ecf83c1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ecf83c1 Branch: refs/heads/master Commit: 6ecf83c1c4491e44a7164ea0c7a23ce018a5b6d5 Parents: 01ca056 2d7a219 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 27 14:07:27 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 27 14:07:27 2014 +0200 ---------------------------------------------------------------------- .../camel/issues/OnCompletionIssueTest.java | 2 +- .../camel/component/quartz/QuartzComponent.java | 10 +++--- .../quartz/QuartzCronTriggerRouteTest.java | 34 ++++++++++++++++++++ .../camel/component/quartz2/QuartzEndpoint.java | 25 ++++++++++---- .../quartz2/QuartzCronTriggerRouteTest.java | 34 ++++++++++++++++++++ 5 files changed, 93 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
