summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2012-04-23 21:06:47 -0400
committerMichael DeHaan <michael.dehaan@gmail.com>2012-04-23 21:06:47 -0400
commita8707e48e84706986696a24507d71b55d886a7be (patch)
treef352624db57423e2b49c207772cf084a113eab6c
parentc00699d0ef0f960b670cc07e75245fcecbfed8d2 (diff)
downloadansible-a8707e48e84706986696a24507d71b55d886a7be.tar.gz
Fix merge issue
-rw-r--r--lib/ansible/runner.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index 1c9437a435..fcb26cc4ca 100644
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -27,6 +27,7 @@ import random
import traceback
import tempfile
import base64
+import getpass
import ansible.constants as C
import ansible.connection