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

Posted to commits@solr.apache.org by cp...@apache.org on 2024/03/04 14:14:28 UTC

(solr) 03/03: Merge remote-tracking branch 'origin/main' into jira/solr-13350

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

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

commit 774d60cdd6a2befabad775ddf1c8bd337215ddaf
Merge: 186228dde2f 602ba18e7c3
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Mon Mar 4 14:11:49 2024 +0000

    Merge remote-tracking branch 'origin/main' into jira/solr-13350

 solr/CHANGES.txt                                   |   4 +-
 .../solr/security/PKIAuthenticationPlugin.java     |  60 +++++++----
 .../solr/request/macro/TestMacroExpander.java      |   3 +-
 .../solr/security/TestPKIAuthenticationPlugin.java |   4 +-
 .../indexing-guide/pages/date-formatting-math.adoc | 115 ++++++++++++++++++++-
 .../query-guide/pages/learning-to-rank.adoc        |   4 +-
 .../query-guide/pages/streaming-expressions.adoc   |   2 +-
 .../io/stream/expr/StreamExpressionParser.java     |   8 +-
 .../solrj/io/stream/StreamExpressionTest.java      |  27 +++++
 9 files changed, 193 insertions(+), 34 deletions(-)