diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index da541ac6..89985169 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,22 @@ +- commits: + - subject: Fix supervisor deadlock during migration + hash: adffde932ec28b114a5821b9ae332a42bb330be2 + body: | + Due to the singleton work, when performing migration M00005 and there + are apps with services created in the database, a deadlock occurs + during database initialization due to a circular + dependency for generating scoped keys. + footer: + Change-type: patch + change-type: patch + Signed-off-by: Felipe Lalanne + signed-off-by: Felipe Lalanne + Connects-to: '#1468' + connects-to: '#1468' + author: Felipe Lalanne + nested: [] + version: 11.14.8 + date: 2020-09-29T03:00:51.902Z - commits: - subject: Correctly evaluate if scheduledApply.delay is not set hash: 90981a00bed100e1496dc71bf0631bc0ab04ffa7 diff --git a/CHANGELOG.md b/CHANGELOG.md index b1666552..31008e3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +# v11.14.8 +## (2020-09-29) + +* Fix supervisor deadlock during migration [Felipe Lalanne] + # v11.14.7 ## (2020-09-25) diff --git a/VERSION b/VERSION index 353cfc6b..b0b77bf0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.14.7 \ No newline at end of file +11.14.8 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 00ffec60..01716a09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "balena-supervisor", - "version": "11.14.7", + "version": "11.14.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6df73be5..1b1821c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "balena-supervisor", "description": "This is balena's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as the balena API informs it to.", - "version": "11.14.7", + "version": "11.14.8", "license": "Apache-2.0", "repository": { "type": "git",