From 26d9f70ce3f02364684645abc10e93a3c46b83c0 Mon Sep 17 00:00:00 2001 From: runner Date: Mon, 15 Apr 2024 18:34:28 +0000 Subject: [PATCH] Combined all changelog files into CHANGELOG.md --- .changelog/4223.yml | 4 ---- .changelog/4225.yml | 4 ---- CHANGELOG.md | 4 ++++ 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 .changelog/4223.yml delete mode 100644 .changelog/4225.yml diff --git a/.changelog/4223.yml b/.changelog/4223.yml deleted file mode 100644 index a450d8bdafb..00000000000 --- a/.changelog/4223.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Added the `--docker_image` and `--image_ref` flags to **pre-commit* to override values from configuration files. - type: feature -pr_number: 4223 diff --git a/.changelog/4225.yml b/.changelog/4225.yml deleted file mode 100644 index 35aa46f9c21..00000000000 --- a/.changelog/4225.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Removed the `update-additional-dependencies` script and pre-commit hook. - type: internal -pr_number: 4225 diff --git a/CHANGELOG.md b/CHANGELOG.md index c582fb59d8f..49a7e51182b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Changelog +## 1.29.2 +* Added the `--docker_image` and `--image_ref` flags to **pre-commit* to override values from configuration files. [#4223](https://github.com/demisto/demisto-sdk/pull/4223) +* Removed the `update-additional-dependencies` script and pre-commit hook. [#4225](https://github.com/demisto/demisto-sdk/pull/4225) + ## 1.29.1 * Fix metadata (i.e. description) for XSOAR6 marketplace. [#4208](https://github.com/demisto/demisto-sdk/pull/4208) * Fixed an issue where `xsoar_on_prem` tag, was not removed as part of the parsing process. [#4218](https://github.com/demisto/demisto-sdk/pull/4218)