Merge branch 'master' of https://github.com/pimlottc/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/803cf77d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/803cf77d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/803cf77d Branch: refs/heads/master Commit: 803cf77d6de15537ef41e7a2352b8d1c5e91c846 Parents: f91155e 89da353 Author: Henryk Konsek <hekon...@gmail.com> Authored: Tue Jun 2 16:52:55 2015 +0200 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Tue Jun 2 16:52:55 2015 +0200 ---------------------------------------------------------------------- .../spring/boot/CamelAutoConfiguration.java | 3 + .../boot/CamelNonInvasiveCamelContextTest.java | 83 ++++++++++++++++++++ .../src/test/resources/externalCamelContext.xml | 19 +++++ 3 files changed, 105 insertions(+) ----------------------------------------------------------------------
