Merge branch 'master' of https://github.com/adaniels21487/librenms into issue-1650

This commit is contained in:
Aaron Daniels
2016-01-14 06:10:31 +10:00
1509 changed files with 171409 additions and 1602 deletions

View File

@@ -505,7 +505,7 @@ Output:
### <a name="api-route-21">Function: `list_oxidized`</a> [`top`](#top)
List devices for use with Oxidized.
List devices for use with Oxidized. If you have group support enabled then a group will also be returned based on your config.
Route: /api/v0/oxidized
@@ -836,7 +836,7 @@ Output:
{
"status": "ok",
"err-msg": "",
"message": "Alert has been ackgnowledged"
"message": "Alert has been acknowledged"
}
```