summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-09 09:37:46 +0000
committerGerrit Code Review <review@openstack.org>2019-01-09 09:37:46 +0000
commite3f280851fcfbbcc9925214cc8241c14658bfda2 (patch)
treed0e5257836eac0955630915c236fd4219321f5ad
parent3ee1cf4b6cdd78e7c85cbf9e00098201d8e0ace5 (diff)
parent37c5cf9a2aaf70d33b5e8190ce87ec7f24744a4a (diff)
Merge "fix typos in the docstring"
-rw-r--r--hooks/charmhelpers/contrib/openstack/context.py2
-rw-r--r--hooks/charmhelpers/fetch/archiveurl.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py
index 614d444..d892bad 100644
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@@ -1201,7 +1201,7 @@ class SubordinateConfigContext(OSContextGenerator):
1201 1201
1202 The subordinate interface allows subordinates to export their 1202 The subordinate interface allows subordinates to export their
1203 configuration requirements to the principle for multiple config 1203 configuration requirements to the principle for multiple config
1204 files and multiple serivces. Ie, a subordinate that has interfaces 1204 files and multiple services. Ie, a subordinate that has interfaces
1205 to both glance and nova may export to following yaml blob as json:: 1205 to both glance and nova may export to following yaml blob as json::
1206 1206
1207 glance: 1207 glance:
diff --git a/hooks/charmhelpers/fetch/archiveurl.py b/hooks/charmhelpers/fetch/archiveurl.py
index dd24f9e..d25587a 100644
--- a/hooks/charmhelpers/fetch/archiveurl.py
+++ b/hooks/charmhelpers/fetch/archiveurl.py
@@ -89,7 +89,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
89 :param str source: URL pointing to an archive file. 89 :param str source: URL pointing to an archive file.
90 :param str dest: Local path location to download archive file to. 90 :param str dest: Local path location to download archive file to.
91 """ 91 """
92 # propogate all exceptions 92 # propagate all exceptions
93 # URLError, OSError, etc 93 # URLError, OSError, etc
94 proto, netloc, path, params, query, fragment = urlparse(source) 94 proto, netloc, path, params, query, fragment = urlparse(source)
95 if proto in ('http', 'https'): 95 if proto in ('http', 'https'):