From 4e5d9df717bb7dfa963e00d174665a93b8be48bb Mon Sep 17 00:00:00 2001
From: Resin CI <34882892+resin-ci@users.noreply.github.com>
Date: Fri, 29 Mar 2019 20:04:35 +0200
Subject: [PATCH] v9.12.6

---
 .versionbot/CHANGELOG.yml | 30 ++++++++++++++++++++++++++++++
 CHANGELOG.md              |  4 ++++
 package-lock.json         |  2 +-
 package.json              |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index cf985fc6..1faf0bd6 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,33 @@
+- commits:
+    - subject: >-
+        Fix migration of legacy apps when there's more than one app in the local
+        DB
+      hash: c90270660000a0043b3f48751ea5186e69904368
+      body: >
+        In an edge case observed in the field, a supervisor's database held two
+        applications
+
+        because the device had been moved and the update lock was set in the old
+        app. This causes
+
+        the updated supervisor to be unable to start, logging "No compatible
+        releases found in API",
+
+        because it can't fetch the release for the app it was moved from.
+
+
+        This commit changes the migration code to iterate through all apps, and
+        remove any for which
+
+        we can't get a release.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
+        signed-off-by: Pablo Carranza Velez <pablo@balena.io>
+      author: Pablo Carranza Velez
+  version: 9.12.6
+  date: 2019-03-29T00:18:13.744Z
 - commits:
     - subject: 'test: Add a test case for deviceConfig.getDefaults'
       hash: ea6ebf822312665280903424d3f4bff1edd0476c
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 736cd1a8..af956225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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/).
 
+## 9.12.6 - 2019-03-29
+
+* Fix migration of legacy apps when there's more than one app in the local DB [Pablo Carranza Velez]
+
 ## 9.12.5 - 2019-03-28
 
 * Test: Add a test case for deviceConfig.getDefaults [Pablo Carranza Velez]
diff --git a/package-lock.json b/package-lock.json
index 5ee9b5a3..7f453c13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "9.12.5",
+  "version": "9.12.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3a2d041a..595c843b 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": "9.12.5",
+  "version": "9.12.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",