Merge branch 'CAMEL-6939'
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/30545df9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/30545df9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/30545df9 Branch: refs/heads/master Commit: 30545df9732cdaaa601bd948711a3eeb427b7dda Parents: fa9b6e5 96c9845 Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Fri Jun 27 12:27:01 2014 +0200 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Fri Jun 27 12:27:01 2014 +0200 ---------------------------------------------------------------------- .../osgi/blueprint/CamelBlueprint4Test.java | 1 + .../osgi/core/xslt/XsltBlueprintRouteTest.java | 1 + .../itest/osgi/disruptor/DisruptorTest.java | 23 ++++++-------------- .../osgi/disruptor/vm/DisruptorVmTest.java | 7 +++++- .../camel/itest/osgi/groovy/GroovyTest.java | 14 ++++++++++-- .../itest/osgi/jaxb/JaxbDataFormatTest.java | 11 +++++++++- .../itest/osgi/script/GroovyScriptOsgiTest.java | 11 +++++++++- 7 files changed, 47 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
