diff options
| author | James Cammarata <jimi@sngx.net> | 2015-02-17 15:37:18 -0600 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-02-17 15:37:18 -0600 |
| commit | 2572038f72a08c0f4a7e7dd515e832257206f02a (patch) | |
| tree | 052343f04490c982d149460099bb43c64ac1eeb4 | |
| parent | 37e44bbc14ec1d260ffdbffd2dec9c86b8e0a3e4 (diff) | |
| download | ansible-2572038f72a08c0f4a7e7dd515e832257206f02a.tar.gz | |
Fix bad import from merge conflict resolution in filter_plugins/core.py
| -rw-r--r-- | lib/ansible/runner/filter_plugins/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/runner/filter_plugins/core.py b/lib/ansible/runner/filter_plugins/core.py index 1eb17202cc..ec8d1785b2 100644 --- a/lib/ansible/runner/filter_plugins/core.py +++ b/lib/ansible/runner/filter_plugins/core.py @@ -32,7 +32,7 @@ from jinja2.filters import environmentfilter from distutils.version import LooseVersion, StrictVersion from ansible import errors -from ansible.utils.hashing import md5s, checksum_s +from ansible.utils import md5s, checksum_s from ansible.utils.unicode import unicode_wrap, to_unicode |