Merge lp:~andreserl/maas-images/lp1574574 into lp:maas-images

[Andres Rodriguez]

[lp:~andreserl/maas-images/lp1574574]

292. By Andres Rodriguez on 2016-04-25

Address comments

=== modified file 'conf/meph-v2.yaml'
--- conf/meph-v2.yaml	2016-03-07 14:18:30 +0000
+++ conf/meph-v2.yaml	2016-04-25 20:07:59 +0000
@@ -21,11 +21,13 @@
  - &sa_hwe_v  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
  - &sa_hwe_w  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
  - &sa_hwe_x  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
+ - &sa_hwe_y  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
  - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
  - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
  - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
  - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
  - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
+ - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
 
 misc:
  - &glpae generic-lpae
@@ -36,6 +38,18 @@
  - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
 
 releases:
+ - version: "16.10"
+   release: yakkety
+   kernels:
+    - [yakkety,  amd64,   hwe-y,    generic,   linux-generic,            *sa_hwe_y]
+    - [yakkety,  arm64,   hwe-y,    generic,   linux-generic,            *sa_hwe_y]
+    - [yakkety,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
+    - [yakkety,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
+    - [yakkety,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
+    - [yakkety,  armhf,   hwe-y,    generic,   linux-generic,            *arm_hwe_y]
+    - [yakkety,  i386,    hwe-y,    generic,   linux-generic,            *sa_hwe_y]
+    - [yakkety,  ppc64el, hwe-y,    generic,   linux-generic,            *sa_hwe_y]
+    - [yakkety,  s390x,   hwe-y,    generic,   linux-generic,            *sa_hwe_y]
  - version: "16.04"
    release: xenial
    kernels:

=== modified file 'meph2/ubuntu_info.py'
--- meph2/ubuntu_info.py	2016-02-25 18:25:34 +0000
+++ meph2/ubuntu_info.py	2016-04-25 20:07:59 +0000
@@ -37,6 +37,7 @@
     ("15.04", "Vivid Vervet", False),
     ("15.10", "Wily Werewolf", False),
     ("16.04", "Xenial Xerus", True),
+    ("16.10", "Yakkety Yak", False),
 )