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

Posted to commits@lucene.apache.org by rm...@apache.org on 2019/12/14 17:33:00 UTC

[lucene-solr] 01/01: Merge branch 'master' into jira/SOLR-13984

This is an automated email from the ASF dual-hosted git repository.

rmuir pushed a commit to branch jira/SOLR-13984
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 0f8aafe99b01481ea40a60ba1f6bf6828a57c2db
Merge: 60a9665 7c048c5
Author: Robert Muir <rm...@apache.org>
AuthorDate: Sat Dec 14 12:32:45 2019 -0500

    Merge branch 'master' into jira/SOLR-13984

 .../ConcurrentCreateCollectionTest.java            |  9 ++-
 solr/solr-ref-guide/src/analytics.adoc             |  7 +-
 solr/solr-ref-guide/src/config-sets.adoc           | 29 ++++++--
 .../src/configuring-solrconfig-xml.adoc            | 16 +++-
 .../src/detecting-languages-during-indexing.adoc   |  2 +-
 solr/solr-ref-guide/src/filter-descriptions.adoc   |  8 +-
 solr/solr-ref-guide/src/index.adoc                 | 21 +++++-
 solr/solr-ref-guide/src/language-analysis.adoc     | 32 ++++----
 solr/solr-ref-guide/src/learning-to-rank.adoc      |  2 +-
 solr/solr-ref-guide/src/libs.adoc                  | 78 ++++++++++++++++++++
 .../src/resource-and-plugin-loading.adoc           | 86 ----------------------
 solr/solr-ref-guide/src/resource-loading.adoc      | 44 +++++++++++
 solr/solr-ref-guide/src/solr-plugins.adoc          | 40 +++++++++-
 .../src/the-well-configured-solr-instance.adoc     | 15 ++--
 solr/solr-ref-guide/src/tokenizers.adoc            |  2 +-
 .../src/update-request-processors.adoc             |  2 +-
 16 files changed, 257 insertions(+), 136 deletions(-)