[3/3] git commit: Merge branch 'develop' into ldp

[wikier]

Merge branch 'develop' into ldp


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/37a22849
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/37a22849
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/37a22849

Branch: refs/heads/ldp
Commit: 37a228490e4a8d096a7892c118bd3d544a76221b
Parents: d80cd64 89fd424
Author: Sergio Fernández <wik...@apache.org>
Authored: Thu Sep 11 09:03:28 2014 +0200
Committer: Sergio Fernández <wik...@apache.org>
Committed: Thu Sep 11 09:03:28 2014 +0200

----------------------------------------------------------------------
 libraries/kiwi/kiwi-caching-infinispan/pom.xml  |  9 +++++++--
 .../config/ConfigurationServiceImpl.java        | 21 ++++++++++++++++++++
 .../services/content/ContentServiceImpl.java    |  1 +
 .../main/resources/config-defaults.properties   |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------