MAAS

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

  1. enable_saucy
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 1641
Proposed branch: lp:~andreserl/maas/enable_saucy
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 30 lines (+4/-1)
2 files modified
etc/maas/import_pxe_files (+1/-1)
src/maasserver/enum.py (+3/-0)
To merge this branch: bzr merge lp:~andreserl/maas/enable_saucy
Reviewer Review Type Date Requested Status
Scott Moser (community) Approve
Review via email: mp+187267@code.launchpad.net

Commit message

Add saucy.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

lgtm

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 2013-05-07 01:54:28 +0000
3+++ etc/maas/import_pxe_files 2013-09-24 15:13:07 +0000
4@@ -13,7 +13,7 @@
5
6
7 #RELEASES="precise"
8-RELEASES="precise quantal raring"
9+RELEASES="precise quantal raring saucy"
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 2013-01-30 00:40:53 +0000
16+++ src/maasserver/enum.py 2013-09-24 15:13:07 +0000
17@@ -141,12 +141,15 @@
18 quantal = 'quantal'
19 #:
20 raring = 'raring'
21+ #:
22+ saucy = 'saucy'
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+ (DISTRO_SERIES.saucy, 'Ubuntu 13.10 "Saucy Salamander"'),
30 )
31
32