Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b4da7476 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b4da7476 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b4da7476 Branch: refs/heads/master Commit: b4da74768e2575373084303999afba6cfd344481 Parents: 767dd93 273ef77 Author: Stephen Allen <[email protected]> Authored: Thu Jan 15 18:18:44 2015 -0500 Committer: Stephen Allen <[email protected]> Committed: Thu Jan 15 18:18:44 2015 -0500 ---------------------------------------------------------------------- .../sparql/expr/aggregate/AggAvgDistinct.java | 12 ++++++------ .../main/webapp/js/app/models/fuseki-server.js | 2 +- jena-parent/pom.xml | 2 +- .../apache/jena/security/AssemblerConstants.java | 18 ++++++++++++++++++ .../TestDatasetWithLowerCaseKeywordAnalyzer.java | 3 ++- 5 files changed, 28 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
