diff --git a/.authors.yml b/.authors.yml index b1a8d3aef..dba9e7267 100644 --- a/.authors.yml +++ b/.authors.yml @@ -372,7 +372,7 @@ github: deepeshaburse - name: pre-commit-ci[bot] email: 66853113+pre-commit-ci[bot]@users.noreply.github.com - num_commits: 71 + num_commits: 72 first_commit: 2023-05-02 12:01:43 github: pre-commit-ci[bot] - name: Matthias Kuhn @@ -382,7 +382,7 @@ github: m-kuhn - name: dependabot[bot] email: 49699333+dependabot[bot]@users.noreply.github.com - num_commits: 59 + num_commits: 63 github: dependabot[bot] first_commit: 2024-05-07 10:16:05 - name: Julien Jerphanion @@ -417,5 +417,10 @@ - Robin github: lrandersson email: 34315751+lrandersson@users.noreply.github.com - num_commits: 11 + num_commits: 13 first_commit: 2025-10-21 08:30:00 +- name: David Laehnemann + github: dlaehnemann + email: 1379875+dlaehnemann@users.noreply.github.com + num_commits: 1 + first_commit: 2025-12-15 15:37:06 diff --git a/.mailmap b/.mailmap index d6e9fb67b..bccc50941 100644 --- a/.mailmap +++ b/.mailmap @@ -19,6 +19,7 @@ Chris Burr Chris Burr Daniel Bast <2790401+dbast@users.noreply.github.com> Darryl Miles +David Laehnemann <1379875+dlaehnemann@users.noreply.github.com> Deepesha Burse <87636253+deepeshaburse@users.noreply.github.com> Eric Dill Eric Prestat diff --git a/AUTHORS.md b/AUTHORS.md index 2f475da16..77d6c831d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -11,6 +11,7 @@ Authors are sorted alphabetically. * Connor Martin * Daniel Bast * Darryl Miles +* David Laehnemann * Deepesha Burse * Eric Dill * Eric Prestat diff --git a/CHANGELOG.md b/CHANGELOG.md index 65bb2bd58..b960d91fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ [//]: # (current developments) +## 2025-12-15 3.14.3: +### Bug fixes + +* Force symbolic linking of `_conda` in SH and PKG installers. This fixes a regression introduced by #1090 that made installations fail if `_conda` already exists in the target location. (#1135) +* EXE: Update calls to built-in function `LogSet` to instead call the intended macro definition `${LogSet}`. (#1141) + +### Contributors + +* @dlaehnemann +* @lrandersson + + + ## 2025-12-10 3.14.2: ### Enhancements diff --git a/news/1135-fix-symbolic-linking b/news/1135-fix-symbolic-linking deleted file mode 100644 index d771b3103..000000000 --- a/news/1135-fix-symbolic-linking +++ /dev/null @@ -1,3 +0,0 @@ -### Bug fixes - -* Force symbolic linking of `_conda` in SH and PKG installers. This fixes a regression introduced by #1090 that made installations fail if `_conda` already exists in the target location. (#1135) diff --git a/news/1141-logset-off b/news/1141-logset-off deleted file mode 100644 index d3bfea1b6..000000000 --- a/news/1141-logset-off +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* EXE: Update calls to built-in function `LogSet` to instead call the intended macro definition `${LogSet}$`. (#1141) - -### Deprecations - -* - -### Docs - -* - -### Other - -*