Merge branch 'master' into add-contract-tests
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6908e1c4 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6908e1c4 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6908e1c4 Branch: refs/heads/add-contract-tests Commit: 6908e1c4b921fc8a5c8e5f5c65da0e7cd407aa16 Parents: 2e62ed0 e5035f4 Author: Claude Warren <[email protected]> Authored: Sat May 16 09:53:34 2015 +0100 Committer: Claude Warren <[email protected]> Committed: Sat May 16 09:53:34 2015 +0100 ---------------------------------------------------------------------- .../org/apache/jena/atlas/lib/cache/CacheSimple.java | 15 +++++++++++---- .../apache/jena/tdb/assembler/SettingAssembler.java | 4 +--- 2 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
