summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-24 19:38:02 -0500
committerGitHub <noreply@github.com>2017-05-24 19:38:02 -0500
commita353d4daf48f37eb95affcff0cf318d90c055e7a (patch)
tree2f021cb7dcf451232952ee037a433eb01acff09e
parent72b2d740b64ea0baccfa5ab9a494f707dd2d266b (diff)
parentb0fc25ee969b0f96cbe0081528c7c0b3551a8aa1 (diff)
downloadopenshift-a353d4daf48f37eb95affcff0cf318d90c055e7a.tar.gz
openshift-a353d4daf48f37eb95affcff0cf318d90c055e7a.tar.bz2
openshift-a353d4daf48f37eb95affcff0cf318d90c055e7a.tar.xz
openshift-a353d4daf48f37eb95affcff0cf318d90c055e7a.zip
Merge pull request #4242 from jarrpa/map-pairs-fix
Merged by openshift-bot
-rw-r--r--roles/openshift_logging/filter_plugins/openshift_logging.py2
-rw-r--r--roles/openshift_storage_glusterfs/filter_plugins/openshift_storage_glusterfs.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/filter_plugins/openshift_logging.py b/roles/openshift_logging/filter_plugins/openshift_logging.py
index 44b0b2d48..eac086e81 100644
--- a/roles/openshift_logging/filter_plugins/openshift_logging.py
+++ b/roles/openshift_logging/filter_plugins/openshift_logging.py
@@ -42,7 +42,7 @@ def map_from_pairs(source, delim="="):
if source == '':
return dict()
- return dict(source.split(delim) for item in source.split(","))
+ return dict(item.split(delim) for item in source.split(","))
# pylint: disable=too-few-public-methods
diff --git a/roles/openshift_storage_glusterfs/filter_plugins/openshift_storage_glusterfs.py b/roles/openshift_storage_glusterfs/filter_plugins/openshift_storage_glusterfs.py
index 88801e487..a86c96df7 100644
--- a/roles/openshift_storage_glusterfs/filter_plugins/openshift_storage_glusterfs.py
+++ b/roles/openshift_storage_glusterfs/filter_plugins/openshift_storage_glusterfs.py
@@ -8,7 +8,7 @@ def map_from_pairs(source, delim="="):
if source == '':
return dict()
- return dict(source.split(delim) for item in source.split(","))
+ return dict(item.split(delim) for item in source.split(","))
# pylint: disable=too-few-public-methods