From 77d5c10aee2fb1e23afc2182263483d854e8457d Mon Sep 17 00:00:00 2001 From: Resin CI <34882892+resin-ci@users.noreply.github.com> Date: Wed, 3 Apr 2019 15:39:32 +0300 Subject: [PATCH] v9.12.7 --- .versionbot/CHANGELOG.yml | 17 +++++++++++++++++ CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index 1faf0bd6..361fb1c5 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,20 @@ +- commits: + - subject: Fix service comparison when starting a stopped service + hash: 9a343316b21522e34a94a66f2391e63a96516114 + body: | + When comparing a stopped container after a start request, the container + ID will be present in the target state (where usually it is not). We + were already filtering this value out of the current state, but + neglected to do so for the target state. This change now ensures we + remove it from both alias lists if it exists. + footer: + Change-type: patch + change-type: patch + Signed-off-by: Cameron Diver + signed-off-by: Cameron Diver + author: Cameron Diver + version: 9.12.7 + date: 2019-04-03T12:12:48.672Z - commits: - subject: >- Fix migration of legacy apps when there's more than one app in the local diff --git a/CHANGELOG.md b/CHANGELOG.md index 0076ce81..815a9040 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.7 - 2019-04-03 + +* Fix service comparison when starting a stopped service [Cameron Diver] + ## 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] diff --git a/package-lock.json b/package-lock.json index 7f453c13..f2ed49ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "balena-supervisor", - "version": "9.12.6", + "version": "9.12.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 595c843b..2540c57e 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.6", + "version": "9.12.7", "license": "Apache-2.0", "repository": { "type": "git",