Merge remote-tracking branch 'upstream/master' into guava
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8957d1a8 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8957d1a8 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8957d1a8 Branch: refs/heads/master Commit: 8957d1a879a75e6bdc6ce8365583b3708ee2a76a Parents: 57eacdc ed13968 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Mar 30 16:56:57 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Mar 30 16:56:57 2015 +0100 ---------------------------------------------------------------------- apache-jena/assembly-jena-zip.xml | 32 - jena-arq/ReleaseNotes.txt | 649 -------- .../riot/system/stream/LocatorClassLoader.java | 4 + .../jena/riot/system/stream/LocatorFTP.java | 1 + .../jena/riot/system/stream/LocatorHTTP.java | 1 + .../jena/riot/system/stream/LocatorStdin.java | 1 + .../jena/riot/system/stream/LocatorZip.java | 2 - jena-core/ReleaseNotes.txt | 1540 ------------------ jena-csv/ReleaseNotes.txt | 14 - jena-fuseki1/ReleaseNotes.txt | 104 -- jena-fuseki2/ReleaseNotes.txt | 19 - .../apache-jena-fuseki/assembly-dist.xml | 2 - .../main/webapp/js/app/models/fuseki-server.js | 5 +- jena-iri/RELEASE_NOTES.txt | 30 - jena-sdb/ChangeLog.txt | 86 - jena-spatial/ReleaseNotes.txt | 18 - jena-tdb/ReleaseNotes.txt | 82 - jena-text/ReleaseNotes.txt | 10 - 18 files changed, 11 insertions(+), 2589 deletions(-) ----------------------------------------------------------------------
