You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ab...@apache.org on 2017/12/04 17:49:07 UTC

[23/50] lucene-solr:jira/solr-11458-2: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


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

Branch: refs/heads/jira/solr-11458-2
Commit: dae529de58b4714e18e38b32ade1973863deb11e
Parents: cabaafa 8072b46
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Nov 28 03:01:18 2017 -0500
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Nov 28 03:01:18 2017 -0500

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  3 +
 .../org/apache/lucene/index/IndexWriter.java    |  6 +-
 .../org/apache/lucene/index/LogMergePolicy.java |  4 +-
 .../apache/lucene/index/TieredMergePolicy.java  |  9 ++-
 .../lucene/index/MockRandomMergePolicy.java     |  4 +-
 .../org/apache/solr/cloud/UtilizeNodeCmd.java   |  5 --
 .../org/apache/solr/handler/StreamHandler.java  |  1 +
 .../solrj/io/eval/NormalizeSumEvaluator.java    | 84 ++++++++++++++++++++
 .../solrj/io/eval/ProbabilityEvaluator.java     | 68 ++++++++++++----
 .../solrj/io/stream/StreamExpressionTest.java   | 67 +++++++++++++++-
 10 files changed, 215 insertions(+), 36 deletions(-)
----------------------------------------------------------------------