maas-test

Merge lp://staging/~matsubara/maas-test/bug-1351488 into lp://staging/maas-test

  1. bug-1351488
  2. Merge into trunk
Proposed by Diogo Matsubara
Status: Merged
Approved by: Diogo Matsubara
Approved revision: 158
Merged at revision: 158
Proposed branch: lp://staging/~matsubara/maas-test/bug-1351488
Merge into: lp://staging/maas-test
Diff against target: 15 lines (+4/-1)
1 file modified
maastest/maasfixture.py (+4/-1)
To merge this branch: bzr merge lp://staging/~matsubara/maas-test/bug-1351488
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+229801@code.staging.launchpad.net

Commit message

Fix query_api_key() to deal with output of recent django-admin.py version.

Description of the change

This branch deals with a change in python-django ubuntu package (1.6.5-3) that outputs the python version being used which makes MAASFixture.query_api_key() method return the wrong value. See bug 1351488 for more details.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve
Revision history for this message
Diogo Matsubara (matsubara) wrote :

Thanks Julian!

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.

Subscribers

People subscribed via source and target branches