MAAS

Merge lp:~andreserl/maas/raring_support into lp:~maas-committers/maas/trunk

  1. raring_support
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Superseded
Proposed branch: lp:~andreserl/maas/raring_support
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 40 lines (+5/-1)
3 files modified
etc/maas/import_pxe_files (+1/-1)
src/maasserver/enum.py (+3/-0)
src/provisioningserver/pxe/config.local.x86.template (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/raring_support
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+145522@code.launchpad.net

This proposal has been superseded by a proposal from 2013-01-30.

Commit message

Add Raring support.

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
1=== modified file 'etc/maas/import_pxe_files'
2--- etc/maas/import_pxe_files 2012-11-12 14:32:26 +0000
3+++ etc/maas/import_pxe_files 2013-01-30 00:42:22 +0000
4@@ -13,7 +13,7 @@
5
6
7 #RELEASES="precise"
8-RELEASES="precise quantal"
9+RELEASES="precise quantal raring"
10 #ARCHES="amd64/generic i386/generic armhf/highbank"
11 #LOCALE="en_US"
12 #IMPORT_EPHEMERALS=1
13
14=== modified file 'src/maasserver/enum.py'
15--- src/maasserver/enum.py 2012-10-08 17:05:43 +0000
16+++ src/maasserver/enum.py 2013-01-30 00:42:22 +0000
17@@ -139,11 +139,14 @@
18 precise = 'precise'
19 #:
20 quantal = 'quantal'
21+ #:
22+ raring = 'raring'
23
24 DISTRO_SERIES_CHOICES = (
25 (DISTRO_SERIES.default, 'Default Ubuntu Release'),
26 (DISTRO_SERIES.precise, 'Ubuntu 12.04 LTS "Precise Pangolin"'),
27 (DISTRO_SERIES.quantal, 'Ubuntu 12.10 "Quantal Quetzal"'),
28+ (DISTRO_SERIES.raring, 'Ubuntu 13.04 "Raring Ringtail"'),
29 )
30
31
32
33=== modified file 'src/provisioningserver/pxe/config.local.x86.template'
34--- src/provisioningserver/pxe/config.local.x86.template 2012-08-17 11:12:09 +0000
35+++ src/provisioningserver/pxe/config.local.x86.template 2013-01-30 00:42:22 +0000
36@@ -3,3 +3,4 @@
37 LABEL local
38 SAY Booting local disk ...
39 KERNEL chain.c32
40+ APPEND hd0