Merge lp:~julian-edwards/maas/1.2-say-bug-1172966 into lp:maas/1.2

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1376
Proposed branch: lp:~julian-edwards/maas/1.2-say-bug-1172966
Merge into: lp:maas/1.2
Diff against target: 9 lines (+0/-1)
1 file modified
src/provisioningserver/pxe/config.local.template (+0/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/1.2-say-bug-1172966
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+161063@code.launchpad.net

Commit message

Backport r1470 from trunk: Using SAY in pxe templates breaks ARM

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/pxe/config.local.template'
--- src/provisioningserver/pxe/config.local.template 2012-08-17 11:12:09 +0000
+++ src/provisioningserver/pxe/config.local.template 2013-04-26 04:33:27 +0000
@@ -1,5 +1,4 @@
1DEFAULT local1DEFAULT local
22
3LABEL local3LABEL local
4 SAY Booting local disk ...
5 LOCALBOOT 04 LOCALBOOT 0

Subscribers

People subscribed via source and target branches

to status/vote changes: