Merge lp:~zulcss/charm-helpers/fix-typo into lp:charm-helpers

[Chuck Short]

Fix typo in cloud archive.

[Ryan Beisner (1chb1n)]

This is superseded by code which is already in trunk.

Unmerged revisions

659. By Chuck Short on 2016-11-14

Fix thinko

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-11-11 18:09:38 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-11-14 20:01:43 +0000
@@ -547,9 +547,9 @@
             'newton': 'xenial-updates/newton',
             'newton/updates': 'xenial-updates/newton',
             'newton/proposed': 'xenial-proposed/newton',
-            'zesty': 'zesty-updates/ocata',
-            'zesty/updates': 'xenial-updates/ocata',
-            'zesty/proposed': 'xenial-proposed/ocata',
+            'ocata': 'xenial-updates/ocata',
+            'ocata/updates': 'xenial-updates/ocata',
+            'ocata/proposed': 'xenial-proposed/ocata',
         }
 
         try: