Merge lp:~smoser/software-properties/trunk.os-releases into lp:software-properties

[Scott Moser]

[Scott Moser (smoser)]

as requested in bug 1645827

[lp:~smoser/software-properties/trunk.os-releases]

990. By Scott Moser on 2017-03-06

sort

[Corey Bryant (corey.bryant)]

Looks good, thanks!

review: Approve

=== modified file 'softwareproperties/cloudarchive.py'
--- softwareproperties/cloudarchive.py	2016-11-29 18:35:50 +0000
+++ softwareproperties/cloudarchive.py	2017-03-06 14:53:41 +0000
@@ -39,6 +39,8 @@
     'mitaka': 'trusty',
     'newton': 'xenial',
     'ocata': 'xenial',
+    'pike': 'xenial',
+    'queens': 'xenial',
 }
 MIRROR = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
 UCA = "Ubuntu Cloud Archive"