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 2019/10/17 07:02:49 UTC

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

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

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

commit e4af36a2be8cec0e64eebedc170290fdd506a5c1
Merge: b541fa3 63e9bcf
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Oct 17 09:02:38 2019 +0200

    Merge branch 'master' into jira/solr-13677-final

 dev-tools/scripts/jenkins.build.ref.guide.sh       |   9 +-
 lucene/CHANGES.txt                                 |   6 +
 .../org/apache/lucene/search/BooleanQuery.java     |  21 +-
 .../org/apache/lucene/search/TestQueryVisitor.java |  18 +
 lucene/ivy-versions.properties                     |   7 +-
 solr/CHANGES.txt                                   |   4 +
 .../java/org/apache/solr/security/AuditEvent.java  |  22 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |  26 +-
 .../solr/security/auditlog_plugin_security.json    |   4 +-
 .../solr/search/join/TestCloudNestedDocsSort.java  |  16 +-
 .../solr/security/AuditLoggerIntegrationTest.java  | 413 +++++++++++++--------
 .../solr/security/BasicAuthIntegrationTest.java    |   6 +-
 .../solr/security/CallbackAuditLoggerPlugin.java   |  29 +-
 .../asciidoctor-ant-1.6.0-alpha.5.jar.sha1         |   1 -
 solr/licenses/asciidoctor-ant-1.6.2.jar.sha1       |   1 +
 solr/solr-ref-guide/README.adoc                    |  26 +-
 solr/solr-ref-guide/src/_config.yml.template       |   4 +-
 .../src/basic-authentication-plugin.adoc           |   2 +-
 .../src/common-query-parameters.adoc               |   2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   2 +-
 .../src/kerberos-authentication-plugin.adoc        |   2 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc     |   6 +-
 ...onitoring-solr-with-prometheus-and-grafana.adoc |   4 +-
 .../src/resource-and-plugin-loading.adoc           |   2 +-
 .../setting-up-an-external-zookeeper-ensemble.adoc |   6 +-
 .../src/solr-control-script-reference.adoc         |   4 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |   2 +-
 .../src/solrcloud-autoscaling-api.adoc             |   4 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |   4 +-
 ...ng-zookeeper-to-manage-configuration-files.adoc |   2 +-
 30 files changed, 419 insertions(+), 236 deletions(-)