Skip to content

Commit

Permalink
Auto-merge for PR #767 via VersionBot
Browse files Browse the repository at this point in the history
Add 'or mounted resinOS image'
  • Loading branch information
resin-io-versionbot[bot] authored Jan 30, 2018
2 parents 0cb4bc9 + 64c95e3 commit 74538bb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion doc/cli.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
3 changes: 2 additions & 1 deletion lib/actions/config.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ exports.inject =
signature: 'config inject <file>'
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:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 74538bb

Please sign in to comment.