Merge lp://qastaging/~rvb/maas/parent-child-relationship into lp://qastaging/~maas-committers/maas/trunk

Proposed by Raphaël Badin
Status: Rejected
Rejected by: MAAS Lander
Proposed branch: lp://qastaging/~rvb/maas/parent-child-relationship
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 627 lines (+473/-2)
8 files modified
src/maasserver/api/nodes.py (+9/-0)
src/maasserver/api/tests/test_enlistment.py (+3/-0)
src/maasserver/api/tests/test_node.py (+41/-0)
src/maasserver/forms.py (+5/-0)
src/maasserver/migrations/0127_add_node_parent.py (+394/-0)
src/maasserver/models/node.py (+7/-0)
src/maasserver/models/tests/test_node.py (+12/-0)
src/maasserver/testing/factory.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~rvb/maas/parent-child-relationship
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+247031@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

3455. By Raphaël Badin

Add parent-child relationship.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.