Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix changes entry formatting (sub-bullets wrongly promoted to top level items); don't interpret parenthesized text starting with 'e.g.' as an attribution.

This commit is contained in:
Steve Rowe 2017-01-18 15:21:23 -05:00
parent 8c2ef3bc7f
commit 85061e39e0
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/site/changes/changes2html.pl
View File

@ -26,7 +26,6 @@ use warnings;
my $jira_url_prefix = 'http://issues.apache.org/jira/browse/'; my $jira_url_prefix = 'http://issues.apache.org/jira/browse/';
my $github_pull_request_prefix = 'https://github.com/apache/lucene-solr/pull/'; my $github_pull_request_prefix = 'https://github.com/apache/lucene-solr/pull/';
my $bugzilla_url_prefix = 'http://issues.apache.org/bugzilla/show_bug.cgi?id=';
my $month_regex = &setup_month_regex; my $month_regex = &setup_month_regex;
my %month_nums = &setup_month_nums; my %month_nums = &setup_month_nums;
my %lucene_bugzilla_jira_map = &setup_lucene_bugzilla_jira_map; my %lucene_bugzilla_jira_map = &setup_lucene_bugzilla_jira_map;
@ -643,6 +642,7 @@ sub markup_trailing_attribution {
(?!inverse\ ) (?!inverse\ )
(?![Tt]he\ ) (?![Tt]he\ )
(?!use\ the\ bug\ number) (?!use\ the\ bug\ number)
(?!e\.?g\.?\b)
[^()"]+?\))\s*$} [^()"]+?\))\s*$}
{\n${extra_newline}<span class="attrib">$1</span>}x) { {\n${extra_newline}<span class="attrib">$1</span>}x) {
# If attribution is not found, then look for attribution with a # If attribution is not found, then look for attribution with a
@ -668,6 +668,7 @@ sub markup_trailing_attribution {
(?!inverse\ ) (?!inverse\ )
(?![Tt]he\ ) (?![Tt]he\ )
(?!use\ the\ bug\ number) (?!use\ the\ bug\ number)
(?!e\.?g\.?\b)
[^()"]+?\))) [^()"]+?\)))
((?:\.|(?i:\.?\s*Issue\s+\d{3,}|LUCENE-\d+)\.?)\s*)$} ((?:\.|(?i:\.?\s*Issue\s+\d{3,}|LUCENE-\d+)\.?)\s*)$}
{ {

16
solr/CHANGES.txt
View File

@ -225,15 +225,15 @@ New Features
* SOLR-9805: Use metrics-jvm library to instrument jvm internals such as GC, memory usage and others. (shalin) * SOLR-9805: Use metrics-jvm library to instrument jvm internals such as GC, memory usage and others. (shalin)
* SOLR-9812: SOLR-9911, SOLR-9960: Added a new /admin/metrics API to return all metrics collected by Solr via API. * SOLR-9812, SOLR-9911, SOLR-9960: Added a new /admin/metrics API to return all metrics collected by Solr via API.
API supports four optional multi-valued parameters: API supports four optional multi-valued parameters:
* 'group' (all,jvm,jetty,node,core), - 'group' (all,jvm,jetty,node,core),
* 'type' (all,counter,timer,gauge,histogram), - 'type' (all,counter,timer,gauge,histogram),
* 'prefix' that filters the returned metrics, - 'prefix' that filters the returned metrics,
* 'registry' that selects one or more registries by prefix (eg. solr.jvm,solr.core.collection1) - 'registry' that selects one or more registries by prefix (eg. solr.jvm,solr.core.collection1)
Example: http://localhost:8983/solr/admin/metrics?group=jvm,jetty&type=counter - Example: http://localhost:8983/solr/admin/metrics?group=jvm,jetty&type=counter
Example: http://localhost:8983/solr/admin/metrics?group=jvm&prefix=buffers,os - Example: http://localhost:8983/solr/admin/metrics?group=jvm&prefix=buffers,os
Example: http://localhost:8983/solr/admin/metrics?registry=solr.node,solr.core&prefix=ADMIN - Example: http://localhost:8983/solr/admin/metrics?registry=solr.node,solr.core&prefix=ADMIN
(shalin, ab) (shalin, ab)
* SOLR-9884: Add version to segments handler output (Steven Bower via Erick Erickson) * SOLR-9884: Add version to segments handler output (Steven Bower via Erick Erickson)