You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2023/07/21 20:54:07 UTC
[solr] branch main updated: Fix changelog entry
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 2df670d198a Fix changelog entry
2df670d198a is described below
commit 2df670d198a9b225dd15687287b7b44cbe5e7837
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Jul 21 16:53:56 2023 -0400
Fix changelog entry
---
dev-tools/scripts/releaseWizard.py | 14 +++++++-------
solr/CHANGES.txt | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py
index 386a557b90b..bbfe9e802c7 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -115,7 +115,7 @@ def expand_jinja(text, vars=None):
'vote_close_72h': vote_close_72h_date().strftime("%Y-%m-%d %H:00 UTC"),
'vote_close_72h_epoch': unix_time_millis(vote_close_72h_date()),
'vote_close_72h_holidays': vote_close_72h_holidays(),
- 'solr_news_file': solr_news_file,
+ 'solr_news_file': state.get_solr_news_file(),
'load_lines': load_lines,
'set_java_home': set_java_home,
'latest_version': state.get_latest_version(),
@@ -630,6 +630,10 @@ class ReleaseState:
def get_java_cmd(self):
return os.path.join(self.get_java_home(), "bin", "java")
+ def get_solr_news_file(self):
+ return os.path.join(state.get_website_git_folder(), 'content', 'solr', 'solr_news',
+ "%s-%s-available.md" % (state.get_release_date_iso(), state.release_version.replace(".", "-")))
+
def get_todo_states(self):
states = {}
if self.todos:
@@ -1319,10 +1323,6 @@ def main():
os.environ['JAVA_HOME'] = state.get_java_home()
os.environ['JAVACMD'] = state.get_java_cmd()
- global solr_news_file
- solr_news_file = os.path.join(state.get_website_git_folder(), 'content', 'solr', 'solr_news',
- "%s-%s-available.md" % (state.get_release_date_iso(), state.release_version.replace(".", "-")))
-
main_menu = ConsoleMenu(title="Solr ReleaseWizard",
subtitle=get_releasing_text,
prologue_text="Welcome to the release wizard. From here you can manage the process including creating new RCs. "
@@ -1885,9 +1885,9 @@ def vote_close_72h_holidays():
def prepare_announce_solr(todo): # pylint: disable=unused-argument
- if not os.path.exists(solr_news_file):
+ if not os.path.exists(state.get_solr_news_file()):
solr_text = expand_jinja("(( template=announce_solr ))")
- with open(solr_news_file, 'w') as fp:
+ with open(state.get_solr_news_file(), 'w') as fp:
fp.write(solr_text)
# print("Wrote Solr announce draft to %s" % solr_news_file)
else:
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c53e26f5043..d4b3494f579 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -68,8 +68,6 @@ Optimizations
* SOLR-16845: BinaryResponseWriter should not attempt cast to Utf8CharSequence (Alex Deparvu via Houston Putman)
-* SOLR-16273: Improve the performance of the Prometheus Metric Exporter scraping metrics (Matthew Biscocho via David Smiley & Christine Poerschke)
-
Bug Fixes
---------------------
@@ -277,6 +275,8 @@ Optimizations
* SOLR-16869: Enable Incubating Java Panama Vector APIs when using Java 20 or 21.
When run using compatible hardware, Vector search will see considerable speed up. (Houston Putman, Uwe Schindler)
+* SOLR-16273: Improve the performance of the Prometheus Metric Exporter scraping metrics (Matthew Biscocho via David Smiley & Christine Poerschke)
+
Bug Fixes
---------------------