Merge branch 'CAMEL-7195' of https://github.com/grgrzybek/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b0f91f1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b0f91f1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b0f91f1 Branch: refs/heads/master Commit: 6b0f91f1d08aee722461990adca4911b96d9f600 Parents: 78a850c 80402cb Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Feb 13 08:40:39 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Feb 13 08:40:39 2014 +0100 ---------------------------------------------------------------------- .../camel/component/cache/CacheComponent.java | 2 +- .../cache/DefaultCacheManagerFactory.java | 3 +- .../camel-cache/src/main/resources/ehcache.xml | 510 ------------------- .../cache/DefaultCacheManagerFactoryTest.java | 21 +- 4 files changed, 23 insertions(+), 513 deletions(-) ----------------------------------------------------------------------
