You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/01/03 07:23:46 UTC

[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 33304f202c88003b4bb2ac2d02307441e5a54807
Parents: 3988532 0999f67
Author: Noble Paul <no...@apache.org>
Authored: Tue Jan 3 17:53:34 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jan 3 17:53:34 2017 +1030

----------------------------------------------------------------------
 solr/CHANGES.txt                                |   6 +-
 .../org/apache/solr/handler/StreamHandler.java  |   2 +-
 .../solr/spelling/DirectSolrSpellChecker.java   |  18 ++-
 .../reporters/SolrGangliaReporterTest.java      |   3 +-
 .../reporters/SolrGraphiteReporterTest.java     |   3 +-
 .../client/solrj/io/stream/PriorityStream.java  | 161 +++++++++++++++++++
 .../client/solrj/io/stream/SchedulerStream.java | 161 -------------------
 .../solrj/io/stream/StreamExpressionTest.java   |  20 +--
 8 files changed, 191 insertions(+), 183 deletions(-)
----------------------------------------------------------------------