Merge branch 'master' into hadoop-rdf Merge in JENA-813 fixes
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/43d59272 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/43d59272 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/43d59272 Branch: refs/heads/hadoop-rdf Commit: 43d592725023688fde945b584ae72fb0feecb10b Parents: 0c14b20 6c2c87c Author: Rob Vesse <rve...@apache.org> Authored: Tue Nov 11 10:55:43 2014 +0000 Committer: Rob Vesse <rve...@apache.org> Committed: Tue Nov 11 10:55:43 2014 +0000 ---------------------------------------------------------------------- jena-arq/ReleaseNotes.txt | 5 + .../jena/sparql/core/DatasetGraphBaseFind.java | 2 +- .../jena/sparql/core/DatasetGraphCaching.java | 2 +- .../sparql/core/DatasetGraphCollection.java | 7 +- .../org/apache/jena/atlas/iterator/Iter.java | 29 +++- .../jena/atlas/iterator/IteratorConcat.java | 8 +- .../jena/atlas/iterator/IteratorCons.java | 134 ++++++++++--------- .../java/org/apache/jena/atlas/lib/Map2.java | 2 +- .../java/org/apache/jena/riot/ResultSetMgr.java | 16 ++- .../jena/riot/resultset/ResultSetWriter.java | 5 + .../riot/resultset/ResultSetWriterRegistry.java | 36 ++++- .../apache/jena/atlas/iterator/TestIter.java | 24 ++-- .../jena/atlas/iterator/TestIteratorPeek.java | 2 +- 13 files changed, 176 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
