Merge lp://staging/~julian-edwards/maas/releasenotes-1.6 into lp://staging/~maas-committers/maas/trunk
Proposed by
Julian Edwards
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~julian-edwards/maas/releasenotes-1.6 |
Merge into: | lp://staging/~maas-committers/maas/trunk |
Diff against target: |
259 lines (+165/-2) (has conflicts) 5 files modified
docs/changelog.rst (+125/-0) src/maasserver/rpc/tests/test_regionservice.py (+15/-0) src/provisioningserver/drivers/osystem/ubuntu.py (+1/-2) src/provisioningserver/import_images/boot_resources.py (+15/-0) src/provisioningserver/upgrade_cluster.py (+9/-0) Text conflict in src/maasserver/rpc/tests/test_regionservice.py Text conflict in src/provisioningserver/import_images/boot_resources.py Text conflict in src/provisioningserver/upgrade_cluster.py |
To merge this branch: | bzr merge lp://staging/~julian-edwards/maas/releasenotes-1.6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-08-12.
To post a comment you must log in.
The special notice is useful, but not very clear I think, from the standpoint of someone who doesn't yet know what it's about. Maybe split this up into sentences conveying separate points of information? 1. Cluster interfaces now have "static IP ranges." 2. These are needed in order to give stable IP addresses to nodes. 3. You need to edit them.