From 0e7a12689f7d061c891918050975c3a91c2ba31c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:21:58 +0000 Subject: [PATCH] missed the two changelog pointers (#10138) (#10139) * missed the two changelog pointers * Apply suggestions from code review fixup! missed the two changelog pointers Co-authored-by: ffaf1 * squash! and the other two changelogs --------- Co-authored-by: ffaf1 (cherry picked from commit 82cad891a8b6f966a6a160d6fe3997680760abda) Co-authored-by: brandon s allbery kf8nh Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- Cabal-syntax/ChangeLog.md | 2 +- Cabal/ChangeLog.md | 3 +++ cabal-install-solver/ChangeLog.md | 2 +- cabal-install/changelog | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cabal-syntax/ChangeLog.md b/Cabal-syntax/ChangeLog.md index 7554aaf4980..73c417220df 100644 --- a/Cabal-syntax/ChangeLog.md +++ b/Cabal-syntax/ChangeLog.md @@ -1 +1 @@ -Please see https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.12.0.0.md +Please see https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.12.1.0.md diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md index 7aebc02edda..681bbc5a84a 100644 --- a/Cabal/ChangeLog.md +++ b/Cabal/ChangeLog.md @@ -1,3 +1,6 @@ +# 3.12.1.0 [Artem Pelenitsyn](mailto:a.pelenitsyn@gmail.com) June 2024 +* See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.12.1.0.md + # 3.12.0.0 [Francesco Ariis](mailto:fa-ml@ariis.it) May 2024 # 3.12.0.0 [Francesco Ariis](mailto:fa-ml@ariis.it) March 2024 * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.12.0.0.md diff --git a/cabal-install-solver/ChangeLog.md b/cabal-install-solver/ChangeLog.md index 3bfdd653afe..3cd7794fe29 100644 --- a/cabal-install-solver/ChangeLog.md +++ b/cabal-install-solver/ChangeLog.md @@ -1 +1 @@ -Please see https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.3.0.md +Please see https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.12.1.0.md diff --git a/cabal-install/changelog b/cabal-install/changelog index 2d742052eeb..281329c7fe7 100644 --- a/cabal-install/changelog +++ b/cabal-install/changelog @@ -1,5 +1,8 @@ -*-change-log-*- +3.12.1.0 Artem Pelenitsyn June 2024 + * See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.12.1.0.md + 3.10.3.0 Hécate January 2024 * See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.3.0.md