MAAS

Merge lp://staging/~julian-edwards/maas/remove-update-leases-api into lp://staging/~maas-committers/maas/trunk

  1. remove-update-leases-api
  2. Merge into trunk
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 2923
Proposed branch: lp://staging/~julian-edwards/maas/remove-update-leases-api
Merge into: lp://staging/~maas-committers/maas/trunk
Diff against target: 235 lines (+0/-156)
2 files modified
src/maasserver/api/node_groups.py (+0/-17)
src/maasserver/api/tests/test_nodegroup.py (+0/-139)
To merge this branch: bzr merge lp://staging/~julian-edwards/maas/remove-update-leases-api
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+233466@code.staging.launchpad.net

Commit message

Remove the update_leases API call and associated tests, it's now all done in RPC

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Yay!

Remember to run “make lint” to look for imports that are no longer used, and after fixing, “make format” as well.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

Attempt to merge into lp:maas failed due to conflicts:

text conflict in src/maasserver/api/tests/test_nodegroup.py

Revision history for this message
MAAS Lander (maas-lander) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

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.