Auto-merge for PR #608 via VersionBot

Respond to reboot and shutdown endpoints with a success object

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/).
 
+## v7.1.24 - 2018-03-29
+
+* Respond to reboot and shutdown endpoints with a success object #608 [Cameron Diver]
+
 ## v7.1.23 - 2018-03-29
 
 * Avoid weird cwd errors when dist does not exist with sync #606 [Cameron Diver]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io'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 Resin's API informs it to.",
-  "version": "7.1.23",
+  "version": "7.1.24",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

src/device-state.coffee

@@ -368,9 +368,13 @@ module.exports = class DeviceState extends EventEmitter
 			else
 				switch step.action
 					when 'reboot'
-						@reboot(force, skipLock)
+						# There isn't really a way that these methods can fail,
+						# and if they do, we wouldn't know about it until after
+						# the response has been sent back to the API. Just return
+						# "OK" for this and the below action
+						@reboot(force, skipLock).return(Data: 'OK', Error: null)
 					when 'shutdown'
-						@shutdown(force, skipLock)
+						@shutdown(force, skipLock).return(Data: 'OK', Error: null)
 					when 'noop'
 						Promise.resolve()
 					else