You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/26 09:42:25 UTC
[8/8] lucene-solr:jira/solr-8668: Merge branch 'master' into
jira/solr-8668
Merge branch 'master' into jira/solr-8668
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8143752f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8143752f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8143752f
Branch: refs/heads/jira/solr-8668
Commit: 8143752f733befee9ba67c3a0d95b5ccfb72764c
Parents: 61f1c6e 4106e1b
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri May 26 10:27:41 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 26 10:27:41 2017 +0100
----------------------------------------------------------------------
.../lucene/analysis/core/StopFilterFactory.java | 2 +-
.../compound/hyphenation/hyphenation.dtd | 2 +-
.../lucene/analysis/compound/hyphenation.dtd | 2 +-
.../analyzing/SuggestStopFilterFactory.java | 2 +-
solr/CHANGES.txt | 4 +
.../org/apache/solr/handler/StreamHandler.java | 12 +-
.../analysis/ManagedSynonymFilterFactory.java | 5 +
.../ManagedSynonymGraphFilterFactory.java | 437 +++++++++++++++++++
.../org/apache/solr/update/SolrIndexConfig.java | 2 +-
.../DocExpirationUpdateProcessorFactory.java | 2 +-
.../solr/collection1/conf/hyphenation.dtd | 2 +-
.../solr/collection1/conf/schema-rest.xml | 30 ++
.../org/apache/solr/rest/TestRestManager.java | 4 +-
.../TestManagedSynonymGraphFilterFactory.java | 297 +++++++++++++
.../conf/managed-schema | 10 +-
.../solr-ref-guide/src/filter-descriptions.adoc | 30 +-
solr/solr-ref-guide/src/language-analysis.adoc | 37 +-
solr/solr-ref-guide/src/managed-resources.adoc | 20 +-
solr/solr-ref-guide/src/other-parsers.adoc | 2 +-
.../shards-and-indexing-data-in-solrcloud.adoc | 5 -
.../solr-ref-guide/src/the-stats-component.adoc | 13 +-
.../solr/common/params/AnalysisParams.java | 2 +-
.../solrj/io/stream/StreamExpressionTest.java | 36 +-
23 files changed, 845 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8143752f/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------