cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10693 from momandine/import_fixes

Browse source 
Import fixes
This commit is contained in:
Toshio Kuratomi 2015-04-13 14:39:01 -07:00
commit c14f072a3b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
v2/ansible/plugins/connections/winrm.py
View file

@ -24,7 +24,8 @@ import os
import re import re
import shlex import shlex
import traceback import traceback
import urlparse
from six.moves.urllib import parse as urlparse
from ansible import errors from ansible import errors
from ansible import utils from ansible import utils
from ansible.callbacks import vvv, vvvv, verbose from ansible.callbacks import vvv, vvvv, verbose

2
v2/ansible/plugins/strategies/__init__.py
View file

@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import Queue from six.moves import queue as Queue
import time import time
from ansible.errors import * from ansible.errors import *