aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-01 11:25:04 +0000
committerGerrit Code Review <review@openstack.org>2016-09-01 11:25:05 +0000
commit9e83fd7925329bcf3e08ef4f3fdf4a418382359e (patch)
tree316346fee311b3362e50653e233d63ed0eb22d49
parentfdb33d04ec2b21c3a28184164666a33351841400 (diff)
parent46e8196fcf4aa7b22218acba5068714cbd79948f (diff)
downloadkolla-ansible-9e83fd7925329bcf3e08ef4f3fdf4a418382359e.tar.gz
kolla-ansible-9e83fd7925329bcf3e08ef4f3fdf4a418382359e.zip
Merge "Use six.StringIO"
-rw-r--r--ansible/action_plugins/merge_configs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py
index 556f6233f..266bc353e 100644
--- a/ansible/action_plugins/merge_configs.py
+++ b/ansible/action_plugins/merge_configs.py
@@ -15,9 +15,9 @@
# limitations under the License.
from ConfigParser import ConfigParser
-from cStringIO import StringIO
import inspect
import os
+from six import StringIO
from ansible.plugins.action import ActionBase