From a2635f47ee38375feb636a396b70b4d4e0717e41 Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Thu, 9 Nov 2017 16:03:06 +0100 Subject: [PATCH 1/2] Avoid AmbiguousApplication errors in device register when an id is used Change-Type: patch Connects-To: #665 --- build/actions/device.js | 2 +- lib/actions/device.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/actions/device.js b/build/actions/device.js index 2ae14456..ddd78b4a 100644 --- a/build/actions/device.js +++ b/build/actions/device.js @@ -110,7 +110,7 @@ exports.register = { } else { console.info('Using provided device api key'); } - return resin.models.device.register(application.app_name, uuid, deviceApiKey); + return resin.models.device.register(application.id, uuid, deviceApiKey); }).get('uuid').nodeify(done); } }; diff --git a/lib/actions/device.coffee b/lib/actions/device.coffee index 30842740..7e4f3695 100644 --- a/lib/actions/device.coffee +++ b/lib/actions/device.coffee @@ -168,7 +168,7 @@ exports.register = console.info("Using generated device api key: #{deviceApiKey}") else console.info('Using provided device api key') - return resin.models.device.register(application.app_name, uuid, deviceApiKey) + return resin.models.device.register(application.id, uuid, deviceApiKey) ) .get('uuid') .nodeify(done) From 727a245715d1f0171acaf726f037f10154c40758 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Thu, 9 Nov 2017 15:16:17 +0000 Subject: [PATCH 2/2] v6.8.1 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d215f0c..de6936f8 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/). +## v6.8.1 - 2017-11-09 + +* Avoid AmbiguousApplication errors in device register when an id is used #711 [Tim Perry] + ## v6.8.0 - 2017-10-27 * Allow preloading jetson-tx2 images, improve flasher images detection and remove the --dont-detect-flasher-type-images option. #706 [Alexis Svinartchouk] diff --git a/package.json b/package.json index 4a35eae2..119688ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "resin-cli", - "version": "6.8.0", + "version": "6.8.1", "description": "The official resin.io CLI tool", "main": "./build/actions/index.js", "homepage": "https://github.com/resin-io/resin-cli",