Merge in changes from master.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ff8439ed Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ff8439ed Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ff8439ed Branch: refs/heads/add-contract-tests Commit: ff8439ed243f42cc1c42365d0b6dfcc005d5fe73 Parents: bb8d6f3 2257377 Author: Andy Seaborne <[email protected]> Authored: Mon May 4 20:05:58 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon May 4 20:05:58 2015 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/jena/util/TestOneToManyMap.java | 4 ++-- .../apache/jena/util/iterator/test/TestResourceUtils.java | 3 +++ .../java/org/apache/jena/fuseki/build/FusekiConfig.java | 10 ++++++++-- .../main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
