Merge lp:~jameinel/maas/merge-1.2 into lp:~maas-committers/maas/trunk

[John A Meinel]

Merge the lp:maas/1.2 branch into lp:maas and resolve conflicts.

There were a few text conflicts introduced because of the cherrypicks back to 1.2, but this should make it easier to keep 1.2 changes in sync with trunk.

This gets 1.2 synced into trunk, including our recent changes for kernel options. Probably the only thing that concerns me is the db migration number gets reused (0043). I did test upgrading 1.2 => trunk, which succeeds, and None => trunk which also works fine. No tests fail, so I'm pretty comfortable that everything is ok.

If we do decide to revert the 1.2 changes to keep a simple bugfix-only SRU, then we can probably just remove the kernel_opts patch entirely, and regenerate it later.

After this lands, it should be easy to cherry pick something from trunk back into 1.2, and then merge 1.2 up to trunk. You'll want to do that quickly, because once trunk changes the cherrypick again, you'll end up getting a merge conflict if you haven't merged up already. With a merge-up, things will stay flowing smoothly.

[Martin Packman (gz)]

Looks fine, you probably just want to poke Nick so he knows you've forward ported this doc update.

review: Approve

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-11-08 09:12:44 +0000
+++ src/maasserver/api.py	2012-11-08 09:54:21 +0000
@@ -748,6 +748,13 @@
         The minimum data required is:
         architecture=<arch string> (e.g "i386/generic")
         mac_address=<value>
+
+        :param architecture: A string containing the architecture type of
+            the node.
+        :param mac_address: The MAC address of the node.
+        :param hostname: A hostname. If not given, one will be generated.
+        :param powertype: A power management type, if applicable (e.g.
+            "virsh", "ipmi").
         """
         node = create_node(request)
         if request.user.is_superuser: