From 5fa3f300ddd5ab42d71652595ea49acf6cee2350 Mon Sep 17 00:00:00 2001 From: runner Date: Wed, 31 Jan 2024 19:15:25 +0000 Subject: [PATCH] Combined all changelog files into CHANGELOG.md --- .changelog/3878.yml | 4 ---- .changelog/3975.yml | 4 ---- .changelog/3988.yml | 4 ---- .changelog/3995.yml | 4 ---- .changelog/3999.yml | 4 ---- CHANGELOG.md | 7 +++++++ 6 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 .changelog/3878.yml delete mode 100644 .changelog/3975.yml delete mode 100644 .changelog/3988.yml delete mode 100644 .changelog/3995.yml delete mode 100644 .changelog/3999.yml diff --git a/.changelog/3878.yml b/.changelog/3878.yml deleted file mode 100644 index a87d7e90bfd..00000000000 --- a/.changelog/3878.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Fixed an issue where fetching from a git remote would cause a failure in cases where fetching is not necessary. - type: fix -pr_number: 3878 diff --git a/.changelog/3975.yml b/.changelog/3975.yml deleted file mode 100644 index 9c264b5c8c6..00000000000 --- a/.changelog/3975.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Added support for DOCKER_REGISTRY_URL environment variable. - type: internal -pr_number: 3975 diff --git a/.changelog/3988.yml b/.changelog/3988.yml deleted file mode 100644 index ae4458ddc5b..00000000000 --- a/.changelog/3988.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Added retry mechanism for create docker container. As default, will attempt three times. - type: feature -pr_number: 3988 diff --git a/.changelog/3995.yml b/.changelog/3995.yml deleted file mode 100644 index f53b8370f2e..00000000000 --- a/.changelog/3995.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Fixed the init command to successfully create event collector integration - type: fix -pr_number: 3995 diff --git a/.changelog/3999.yml b/.changelog/3999.yml deleted file mode 100644 index 8e0f1c32326..00000000000 --- a/.changelog/3999.yml +++ /dev/null @@ -1,4 +0,0 @@ -changes: -- description: Fixes an issue where running **pre-commit** with the `run-hook` argument didn't execute the hook in some cases. - type: fix -pr_number: 3999 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7908b25c1f6..1ecdad275b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +## 1.26.1 +* Added retry mechanism for create docker container. As default, will attempt three times. [#3988](https://github.com/demisto/demisto-sdk/pull/3988) +* Fixed the init command to successfully create event collector integration [#3995](https://github.com/demisto/demisto-sdk/pull/3995) +* Fixes an issue where running **pre-commit** with the `run-hook` argument didn't execute the hook in some cases. [#3999](https://github.com/demisto/demisto-sdk/pull/3999) +* Fixed an issue where fetching from a git remote would cause a failure in cases where fetching is not necessary. [#3878](https://github.com/demisto/demisto-sdk/pull/3878) +* Added support for DOCKER_REGISTRY_URL environment variable. [#3975](https://github.com/demisto/demisto-sdk/pull/3975) + ## 1.26.0 * Log file path (can be set by the `--log-file-path` flag or the `DEMISTO_SDK_LOG_FILE_PATH` environment variable) can now only accept directory values. Setting it to a file path is no longer supported (file name is now constantly `demisto_sdk_debug.log` and cannot be changed). The path will now be automatically generated if it doesn't exist. [#3912](https://github.com/demisto/demisto-sdk/pull/3912) * Log files will now be saved by default to `$HOME/.demisto-sdk/logs`. This behavior can be overridden by the `--log-file-path` flag, or the `DEMISTO_SDK_LOG_FILE_PATH` environment variable. [#3912](https://github.com/demisto/demisto-sdk/pull/3912)