diff --git a/VERSION.txt b/VERSION.txt index b955c3b98861..198ec23ccfcc 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.25.6-dev +1.25.6 diff --git a/changelogs/1.23.9.yaml b/changelogs/1.23.9.yaml new file mode 100644 index 000000000000..571d92c3ef35 --- /dev/null +++ b/changelogs/1.23.9.yaml @@ -0,0 +1,6 @@ +date: April 26, 2023 + +bug_fixes: +- area: tls + change: | + Fix build FIPS compliance when using both FIPS mode and Wasm extensions (``--define boringssl=fips`` and ``--define wasm=v8``). diff --git a/changelogs/1.24.7.yaml b/changelogs/1.24.7.yaml new file mode 100644 index 000000000000..571d92c3ef35 --- /dev/null +++ b/changelogs/1.24.7.yaml @@ -0,0 +1,6 @@ +date: April 26, 2023 + +bug_fixes: +- area: tls + change: | + Fix build FIPS compliance when using both FIPS mode and Wasm extensions (``--define boringssl=fips`` and ``--define wasm=v8``). diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 535c3b2b5baf..453a1ca3830e 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -1,20 +1,6 @@ -date: Pending - -behavior_changes: -# *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required* - -minor_behavior_changes: -# *Changes that may cause incompatibilities for some users, but should not for most* +date: April 27, 2023 bug_fixes: -# *Changes expected to improve the state of the world and are unlikely to have negative effects* - area: tls change: | Fix build FIPS compliance when using both FIPS mode and Wasm extensions (``--define boringssl=fips`` and ``--define wasm=v8``). - -removed_config_or_runtime: -# *Normally occurs at the end of the* :ref:`deprecation period ` - -new_features: - -deprecated: diff --git a/docs/inventories/v1.23/objects.inv b/docs/inventories/v1.23/objects.inv index 68538b31026f..b9648fb76c8f 100644 Binary files a/docs/inventories/v1.23/objects.inv and b/docs/inventories/v1.23/objects.inv differ diff --git a/docs/inventories/v1.24/objects.inv b/docs/inventories/v1.24/objects.inv index 241dac7fd3b3..1aac3cc4bd58 100644 Binary files a/docs/inventories/v1.24/objects.inv and b/docs/inventories/v1.24/objects.inv differ diff --git a/docs/inventories/v1.25/objects.inv b/docs/inventories/v1.25/objects.inv index 412b4792c024..e4a500a0de20 100644 Binary files a/docs/inventories/v1.25/objects.inv and b/docs/inventories/v1.25/objects.inv differ diff --git a/docs/versions.yaml b/docs/versions.yaml index 10f3817cd7ab..09829aeeacd6 100644 --- a/docs/versions.yaml +++ b/docs/versions.yaml @@ -16,6 +16,6 @@ "1.20": 1.20.7 "1.21": 1.21.6 "1.22": 1.22.11 -"1.23": 1.23.8 -"1.24": 1.24.6 -"1.25": 1.25.4 +"1.23": 1.23.9 +"1.24": 1.24.7 +"1.25": 1.25.5