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/30b6ccd9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/30b6ccd9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/30b6ccd9 Branch: refs/heads/master Commit: 30b6ccd9c87d84c5a82fb5a91ff69e700fda94fb Parents: 6b0f91f 1366827 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Feb 13 09:16:44 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Feb 13 09:16:44 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/component/cache/CacheComponent.java | 2 +- .../component/cache/DefaultCacheManagerFactory.java | 14 ++++++++++++-- .../cache/DefaultCacheManagerFactoryTest.java | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
