ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-04-07 11:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #711 via VersionBot

Browse Source 
Avoid AmbiguousApplication errors in device register when an id is used
This commit is contained in:
resin-io-versionbot[bot] 2017-11-09 15:20:12 +00:00 committed by GitHub
commit 427664c729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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]

2
build/actions/device.js
View File

@ -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);
}
};

2
lib/actions/device.coffee
View File

@ -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)

2
package.json
View File

@ -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",