You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/05/03 12:49:12 UTC
[8/8] marmotta git commit: Merge branch 'develop' into MARMOTTA-584
Merge branch 'develop' into MARMOTTA-584
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b33b1321
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b33b1321
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b33b1321
Branch: refs/heads/MARMOTTA-584
Commit: b33b132104010066a590ab8a74c8fab31a09926b
Parents: bdfa351 0b89c56
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue May 3 12:48:55 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue May 3 12:48:55 2016 +0200
----------------------------------------------------------------------
README.md | 5 +-
client/marmotta-client-php/pom.xml | 2 +-
client/pom.xml | 2 +-
.../ldclient/ldclient-provider-freebase/pom.xml | 78 -------
.../endpoint/freebase/FreebaseEndpoint.java | 39 ----
.../provider/freebase/FreebaseProvider.java | 227 -------------------
...ache.marmotta.ldclient.api.endpoint.Endpoint | 1 -
....marmotta.ldclient.api.provider.DataProvider | 1 -
.../test/freebase/TestFreebaseProvider.java | 142 ------------
.../src/test/resources/logback.xml | 27 ---
.../ldclient/test/freebase/m.07zqbwz.sparql | 26 ---
.../ldclient/test/freebase/m.0h21k1c.sparql | 26 ---
.../ldclient/test/freebase/m.0nzm.sparql | 27 ---
.../ldclient/test/freebase/m.0wqhskn.sparql | 27 ---
libraries/ldclient/pom.xml | 1 -
libraries/pom.xml | 2 +-
.../backends/marmotta-backend-ostrich/pom.xml | 4 +-
.../backend/ostrich/OstrichSailRepository.java | 5 +-
platform/backends/pom.xml | 7 +-
pom.xml | 2 +-
20 files changed, 15 insertions(+), 636 deletions(-)
----------------------------------------------------------------------