You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/02/15 20:47:33 UTC

[21/50] lucene-solr:master: Merge branch 'apache-https-master' into jira/solr-8593

Merge branch 'apache-https-master' into jira/solr-8593


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/de3ba418
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/de3ba418
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/de3ba418

Branch: refs/heads/master
Commit: de3ba418a5824015289bd1d98a9ecc13be93e1d1
Parents: 750cf6d 33ff6cd
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Nov 21 16:39:06 2016 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Nov 21 16:39:06 2016 -0600

----------------------------------------------------------------------
 dev-tools/doap/README.txt                       |   5 +
 dev-tools/doap/lucene.rdf                       | 707 +++++++++++++++++++
 dev-tools/doap/solr.rdf                         | 455 ++++++++++++
 lucene/CHANGES.txt                              |   6 +
 lucene/build.xml                                |   5 +-
 lucene/common-build.xml                         |   5 +-
 .../org/apache/lucene/search/BooleanQuery.java  |  11 +-
 .../lucene/search/similarities/Axiomatic.java   | 159 +++++
 .../search/similarities/AxiomaticF1EXP.java     |  95 +++
 .../search/similarities/AxiomaticF1LOG.java     |  88 +++
 .../search/similarities/AxiomaticF2EXP.java     |  94 +++
 .../search/similarities/AxiomaticF2LOG.java     |  86 +++
 .../search/similarities/AxiomaticF3EXP.java     |  94 +++
 .../search/similarities/AxiomaticF3LOG.java     |  83 +++
 .../org/apache/lucene/util/QueryBuilder.java    |  23 +-
 .../similarities/TestAxiomaticSimilarity.java   |  86 +++
 lucene/site/changes/changes2html.pl             |  96 +--
 solr/CHANGES.txt                                |   2 +
 solr/build.xml                                  |   4 +-
 .../solr/response/JSONResponseWriter.java       |  14 +-
 .../apache/solr/response/JSONWriterTest.java    |  11 +-
 .../web/js/angular/controllers/analysis.js      |  12 +-
 solr/webapp/web/partials/analysis.html          |   2 +-
 23 files changed, 2038 insertions(+), 105 deletions(-)
----------------------------------------------------------------------