From 33eabb7b973a78d9d5acd912642a9bf5d5f2a9a4 Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Fri, 12 Jan 2024 16:24:24 +0100 Subject: [PATCH] chore: merge 3.12.2 changelog (#9721) Signed-off-by: Etienne Millon --- CHANGES.md | 8 ++++++++ doc/changes/9530.md | 2 -- doc/changes/cram-runtest-alias-version.md | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 doc/changes/9530.md delete mode 100644 doc/changes/cram-runtest-alias-version.md diff --git a/CHANGES.md b/CHANGES.md index 1395d053140..433c3d7c065 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,14 @@ If you're a contributor, please include your CHANGES entry in a file `doc/changes/$PR_NAME.md`. At release time, it will be incoporated into the changelog properly. +3.12.2 (2024-01-05) +------------------- + +- Fix version check in `runtest_alias` for `cram` stanza (#9454, @emillon) + +- Fix stack overflow when a `(run)` action can not be parsed. (#9530, fixes + #9529, @gridbugs) + 3.12.1 (2023-11-29) ------------------- diff --git a/doc/changes/9530.md b/doc/changes/9530.md deleted file mode 100644 index 5cd4954206f..00000000000 --- a/doc/changes/9530.md +++ /dev/null @@ -1,2 +0,0 @@ -- Fix stack overflow when a `(run)` action can not be parsed. (#9530, fixes - #9529, @gridbugs) diff --git a/doc/changes/cram-runtest-alias-version.md b/doc/changes/cram-runtest-alias-version.md deleted file mode 100644 index 32d116c474e..00000000000 --- a/doc/changes/cram-runtest-alias-version.md +++ /dev/null @@ -1 +0,0 @@ -- Fix version check in `runtest_alias` for `cram` stanza (#9454, @emillon)