Merge lp:~andreserl/maas/lp1504340 into lp:maas/trunk

Proposed by Andres Rodriguez on 2015-10-09
Status: Merged
Approved by: Andres Rodriguez on 2015-10-09
Approved revision: 4365
Merged at revision: 4365
Proposed branch: lp:~andreserl/maas/lp1504340
Merge into: lp:maas/trunk
Diff against target: 9 lines (+2/-0)
1 file modified
src/maasserver/migrations/0119_migrate_invalid_network_names.py (+2/-0)
To merge this branch: bzr merge lp:~andreserl/maas/lp1504340
Reviewer Review Type Date Requested Status
Mike Pontillo (community) 2015-10-09 Approve on 2015-10-09
Review via email: mp+273939@code.launchpad.net

Commit message

Fix broken migration (0119_migrate_invalid_network_names.py) for not importing re

To post a comment you must log in.
Mike Pontillo (mpontillo) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maasserver/migrations/0119_migrate_invalid_network_names.py'
--- src/maasserver/migrations/0119_migrate_invalid_network_names.py 2015-08-26 19:14:01 +0000
+++ src/maasserver/migrations/0119_migrate_invalid_network_names.py 2015-10-09 00:13:51 +0000
@@ -1,3 +1,5 @@
1import re
2
1from django.db import models3from django.db import models
2from south.db import db4from south.db import db
3# -*- coding: utf-8 -*-5# -*- coding: utf-8 -*-