Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Sebastian Schaffert # Via Sebastian Schaffert * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: fixed default setting for caching in kiwi Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2ddae235 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2ddae235 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2ddae235 Branch: refs/heads/ldp Commit: 2ddae235620be568c97c527db52d2d24e7bceb92 Parents: 3ef4c49 da93ae3 Author: Rupert Westenthaler <[email protected]> Authored: Tue Feb 18 09:52:38 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Tue Feb 18 09:52:38 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java | 2 +- platform/marmotta-zookeeper/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
