Merge ~jsseidel/maas:jsseidel-add-pool-param-to-api-doc into maas:master

[Spencer Seidel]

Added 'pool' param to machines 'update' docstring in the API.

e8e5278... by Spencer Seidel on 2019-01-15

Moved the pool param so that it doesn't come between power parameters params.

[Newell Jensen (newell-jensen)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b jsseidel-add-pool-param-to-api-doc lp:~jsseidel/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e8e52785e9ff6a7de2e071adc830ee7c335f5726

review: Approve

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index a1f2021..aec4a29 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -541,6 +541,10 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         checked against the expected power parameters for the machine's power
         type ('true' or 'false').  The default is 'false'.
 
+        @param (string) "pool" [required=false] The resource pool to which the
+        machine should belong. All machines belong to the 'default' resource
+        pool if they do not belong to any other resource pool.
+
         @param (string) "zone" [required=false] Name of a valid physical zone
         in which to place this machine.