Merge branch 'develop' into cputhreads

This commit is contained in:
Dane Everitt
2020-04-03 13:48:06 -07:00
committed by GitHub
31 changed files with 1883 additions and 1323 deletions

View File

@@ -18,11 +18,10 @@ class SendPowerRequest extends ClientApiRequest
case 'start':
return Permission::ACTION_CONTROL_START;
case 'stop':
case 'kill':
return Permission::ACTION_CONTROL_STOP;
case 'restart':
return Permission::ACTION_CONTROL_RESTART;
case 'kill':
return Permission::ACTION_CONTROL_KILL;
}
return '__invalid';