From 33fd70291a03fbb49942b06e6e276223e440c580 Mon Sep 17 00:00:00 2001 From: MoranF Date: Fri, 26 Jan 2018 15:43:00 +0100 Subject: [PATCH 1/2] Add 'or mounted resinOS image' Connects-To: #764 Change-Type: patch --- doc/cli.markdown | 3 ++- lib/actions/config.coffee | 3 ++- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/cli.markdown b/doc/cli.markdown index 9caea2f0..a79f1871 100644 --- a/doc/cli.markdown +++ b/doc/cli.markdown @@ -1021,7 +1021,8 @@ drive ## config inject <file> -Use this command to inject a config.json file to the mounted filesystem (e.g. SD card) of a provisioned device" +Use this command to inject a config.json file to the mounted filesystem +(e.g. SD card or mounted resinOS image) of a provisioned device" Examples: diff --git a/lib/actions/config.coffee b/lib/actions/config.coffee index 3b37c314..17899167 100644 --- a/lib/actions/config.coffee +++ b/lib/actions/config.coffee @@ -116,7 +116,8 @@ exports.inject = signature: 'config inject ' description: 'inject a device configuration file' help: ''' - Use this command to inject a config.json file to the mounted filesystem (e.g. SD card) of a provisioned device" + Use this command to inject a config.json file to the mounted filesystem + (e.g. SD card or mounted resinOS image) of a provisioned device" Examples: diff --git a/package.json b/package.json index e6f47776..8a73602c 100644 --- a/package.json +++ b/package.json @@ -149,4 +149,4 @@ "optionalDependencies": { "removedrive": "^1.0.0" } -} \ No newline at end of file +} From 64c95e38111528874b7b356e0df9585679e0111d Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Tue, 30 Jan 2018 17:29:59 +0000 Subject: [PATCH 2/2] v6.12.7 --- CHANGELOG.md | 4 ++++ package.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21e29ba8..aeaf0e37 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.12.7 - 2018-01-30 + +* Add 'or mounted resinOS image' #767 [MoranF] + ## v6.12.6 - 2018-01-29 * Don't use the deprecated 'os configure' format in internal calls #759 [Tim Perry] diff --git a/package.json b/package.json index 8a73602c..35718c0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "resin-cli", - "version": "6.12.6", + "version": "6.12.7", "description": "The official resin.io CLI tool", "main": "./build/actions/index.js", "homepage": "https://github.com/resin-io/resin-cli", @@ -149,4 +149,4 @@ "optionalDependencies": { "removedrive": "^1.0.0" } -} +} \ No newline at end of file