MAAS

Merge lp:~allenap/maas/migration-0121-recompute-storage-size-deps--bug-1495064--1.8 into lp:maas/1.8

  1. migration-0121-recompute-storage-size-deps--bug-1495064--1.8
  2. Merge into 1.8
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 4049
Proposed branch: lp:~allenap/maas/migration-0121-recompute-storage-size-deps--bug-1495064--1.8
Merge into: lp:maas/1.8
Diff against target: 14 lines (+4/-0)
1 file modified
src/maasserver/migrations/0121_recompute_storage_size.py (+4/-0)
To merge this branch: bzr merge lp:~allenap/maas/migration-0121-recompute-storage-size-deps--bug-1495064--1.8
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+273593@code.launchpad.net

Commit message

Backport r4352 from trunk: Declare dependency on metadataserver migration 0015 by maasserver migration 0121.

This should permit upgrades from MAAS 1.5.4 to 1.8.0 to work.

To post a comment you must log in.
Revision history for this message
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
1=== modified file 'src/maasserver/migrations/0121_recompute_storage_size.py'
2--- src/maasserver/migrations/0121_recompute_storage_size.py 2014-12-19 08:30:28 +0000
3+++ src/maasserver/migrations/0121_recompute_storage_size.py 2015-10-06 17:26:12 +0000
4@@ -94,6 +94,10 @@
5
6 class Migration(DataMigration):
7
8+ depends_on = (
9+ ("metadataserver", "0015_rename_nodecommissionresult_add_result_type"),
10+ )
11+
12 def forwards(self, orm):
13 "Recompute storage size with the new commissioning results code."
14 for node in orm['maasserver.node'].objects.all():

Subscribers

People subscribed via source and target branches

to all changes: