MAAS

Merge lp:~rvb/maas/storage-unit-bug-1387431-1.7 into lp:maas/1.7

  1. storage-unit-bug-1387431-1.7
  2. Merge into 1.7
Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 3292
Proposed branch: lp:~rvb/maas/storage-unit-bug-1387431-1.7
Merge into: lp:maas/1.7
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/forms.py (+1/-1)
To merge this branch: bzr merge lp:~rvb/maas/storage-unit-bug-1387431-1.7
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+240147@code.launchpad.net

Commit message

Backport 3322: Fix storage unit on the node edit page.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Trivial backport, self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/forms.py'
2--- src/maasserver/forms.py 2014-10-30 11:22:07 +0000
3+++ src/maasserver/forms.py 2014-10-30 17:36:24 +0000
4@@ -597,7 +597,7 @@
5 memory = forms.IntegerField(
6 required=False, initial=0, label="Memory (MB)")
7 storage = forms.IntegerField(
8- required=False, initial=0, label="Disk space (GB)")
9+ required=False, initial=0, label="Disk space (MB)")
10
11 class Meta:
12 model = Node

Subscribers

People subscribed via source and target branches

to all changes: