From 8c1865c3ec9706731d39c872259f6996fc047e13 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 23 May 2023 23:15:35 +0200 Subject: [PATCH] Update changelog --- CHANGELOG.md | 3 ++- composer.json | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d41319e..ebc43101 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org). -## [Unreleased] +## [3.6.0] - 2023-05-24 ### Added * [#1148](https://github.com/shlinkio/shlink/issues/1148) Add support to delete short URL visits. @@ -47,6 +47,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Fixed * [#1760](https://github.com/shlinkio/shlink/issues/1760) Fix domain not being set to null when importing short URLs with default domain. * [#953](https://github.com/shlinkio/shlink/issues/953) Fix duplicated key errors and short URL creation failing when creating short URLs in parallel that depend on the same new tag or domain. +* [#1741](https://github.com/shlinkio/shlink/issues/1741) Fix randomly using 100% CPU in task workers when trying to download GeoLite DB files. * Fix Shlink trying to connect to RabbitMQ even if configuration set to not connect. diff --git a/composer.json b/composer.json index f5407f99..a3494086 100644 --- a/composer.json +++ b/composer.json @@ -45,11 +45,11 @@ "php-middleware/request-id": "^4.1", "pugx/shortid-php": "^1.1", "ramsey/uuid": "^4.7", - "shlinkio/shlink-common": "dev-main#88a34f1 as 5.5", + "shlinkio/shlink-common": "^5.5", "shlinkio/shlink-config": "^2.4", - "shlinkio/shlink-event-dispatcher": "dev-main#8c677ae as 3.0", - "shlinkio/shlink-importer": "dev-main#6b63b12 as 5.1", - "shlinkio/shlink-installer": "dev-develop#3420434 as 8.4", + "shlinkio/shlink-event-dispatcher": "^3.0", + "shlinkio/shlink-importer": "^5.1", + "shlinkio/shlink-installer": "^8.4", "shlinkio/shlink-ip-geolocation": "^3.2", "shlinkio/shlink-json": "^1.0", "spiral/roadrunner": "^2023.1",