You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/01/25 14:08:36 UTC

[3/3] jena git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

y this merge is necessary,


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/03d6e998
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/03d6e998
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/03d6e998

Branch: refs/heads/master
Commit: 03d6e998cc1544e311d8c9ca417dfbdb76edfa4b
Parents: 63bfe42 7c8ba91
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 25 13:08:12 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 25 13:08:12 2016 +0000

----------------------------------------------------------------------
 .../jena/sparql/engine/QueryExecutionBase.java  | 401 ++++++++-----------
 .../sparql/engine/iterator/QueryIterMinus.java  |  91 ++---
 .../jena/sparql/engine/main/OpExecutor.java     |   2 +-
 jena-core/LICENSE                               |   6 +-
 jena-core/src/main/resources/META-INF/LICENSE   |   6 +-
 jena-sdb/bin/make_classpath                     |   2 +-
 jena-sdb/dist/LICENSE                           | 274 +++++++++++++
 jena-sdb/dist/NOTICE                            |  60 +++
 jena-sdb/pom.xml                                |  21 +
 .../src/main/java/org/apache/jena/sdb/SDB.java  |   2 +-
 10 files changed, 578 insertions(+), 287 deletions(-)
----------------------------------------------------------------------