You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/01/23 18:30:04 UTC

[4/4] git commit: Merge remote-tracking branch 'origin/develop' into develop

Merge remote-tracking branch 'origin/develop' into develop


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

Branch: refs/heads/develop
Commit: 74900e0ebd57b9d3155eab334a81468e0162153f
Parents: 85c9848 e26b3ce
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Jan 23 18:29:27 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Jan 23 18:29:27 2014 +0100

----------------------------------------------------------------------
 commons/marmotta-commons/pom.xml                | 24 +++++
 .../test/provider/ProviderTestBase.java         | 12 +++
 .../provider/freebase/FreebaseProvider.java     | 92 +++++++++++++-------
 .../test/freebase/TestFreebaseProvider.java     | 11 ++-
 .../test/rdf/TestLinkedDataProvider.java        |  1 -
 5 files changed, 106 insertions(+), 34 deletions(-)
----------------------------------------------------------------------