Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import fixes #10693

Merged
merged 3 commits into from
Apr 13, 2015
Merged

Import fixes #10693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd4c30b
Merge remote-tracking branch 'upstream/devel' into devel
momandine Apr 13, 2015
08feaea
Fix plugin imports with six
momandine Apr 13, 2015
164cfdf
Fix typo
momandine Apr 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion v2/ansible/plugins/connections/winrm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
import re
import shlex
import traceback
import urlparse

from six.moves.urllib import parse as urlparse
from ansible import errors
from ansible import utils
from ansible.callbacks import vvv, vvvv, verbose
Expand Down
2 changes: 1 addition & 1 deletion v2/ansible/plugins/strategies/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

import Queue
from six.moves import queue as Queue
import time

from ansible.errors import *
Expand Down