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 2020/05/05 17:19:35 UTC

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

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

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

commit 84d1bb75613ab8438aafcfbe09fc1d774aaa4777
Merge: 2aee667 9ee8aa6
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue May 5 19:19:17 2020 +0200

    Merge branch 'master' into jira/solr-14423

 gradle/render-javadoc.gradle                       |  2 +-
 .../java/org/apache/lucene/util/LineFileDocs.java  | 17 ++++++------
 solr/CHANGES.txt                                   |  4 +++
 solr/bin/solr                                      | 10 ++++++-
 solr/bin/solr.cmd                                  |  8 ++++++
 solr/bin/solr.in.cmd                               |  5 ++++
 solr/bin/solr.in.sh                                |  5 +++-
 .../solr/handler/component/SuggestComponent.java   | 13 +++------
 .../apache/solr/servlet/LoadAdminUiServlet.java    | 31 +++++++++++++---------
 .../apache/solr/update/DirectUpdateHandler2.java   |  5 ----
 10 files changed, 61 insertions(+), 39 deletions(-)