FTR, what I did is:
$ cd /tmp/
$ bzr branch lp:~evilnick/maas/cli-help
$ bzr branch lp:~maas-maintainers/maas/1.2
$ cd maas-1.2
$ bzr merge -c 1326 ../cli-help/
$ bzr di
=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py 2012-11-02 09:48:02 +0000
+++ src/maasserver/api.py 2012-11-06 15:58:18 +0000
@@ -742,6 +742,9 @@
When a node has been added to MAAS by an admin MAAS user, it is
ready for allocation to services running on the MAAS.
+ The minimum data required is:
+ architecture=<arch string> (e.g "i386/generic")
+ mac_address=<value>
"""
node = create_node(request)
if request.user.is_superuser:
--
https://code.launchpad.net/~evilnick/maas/1.2-backport-cli-help/+merge/133071
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~evilnick/maas/1.2-backport-cli-help into lp:maas.
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
