MAAS

Merge lp:~adam-collard/maas/nodegroup-details-docs-backport-1.5 into lp:maas/1.5

  1. nodegroup-details-docs-backport-1.5
  2. Merge into 1.5
Proposed by Adam Collard
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 2289
Proposed branch: lp:~adam-collard/maas/nodegroup-details-docs-backport-1.5
Merge into: lp:maas/1.5
Diff against target: 12 lines (+2/-0)
1 file modified
src/maasserver/api.py (+2/-0)
To merge this branch: bzr merge lp:~adam-collard/maas/nodegroup-details-docs-backport-1.5
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Adam Collard (community) Approve
Review via email: mp+223719@code.launchpad.net

Commit message

Backport of lp:~adam-collard/maas/nodegroup-details-docs to 1.5

Description of the change

Backport of lp:~adam-collard/maas/nodegroup-details-docs

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: .

Revision history for this message
Graham Binns (gmb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api.py'
2--- src/maasserver/api.py 2014-05-21 17:30:26 +0000
3+++ src/maasserver/api.py 2014-06-19 11:36:43 +0000
4@@ -1580,6 +1580,8 @@
5 Returns a ``{system_id: {detail_type: xml, ...}, ...}`` map,
6 where ``detail_type`` is something like "lldp" or "lshw".
7
8+ :param system_ids: System ids of nodes for which to get system details.
9+
10 Note that this is returned as BSON and not JSON. This is for
11 efficiency, but mainly because JSON can't do binary content
12 without applying additional encoding like base-64.

Subscribers

People subscribed via source and target branches

to all changes: