Commit e17afa06 by James Cammarata

Merge branch 'marcore-devel' into devel

parents 41169666 712f4a63
......@@ -41,7 +41,7 @@ class Connection(object):
self.host = host
self.ipv6 = ':' in self.host
self.port = port
self.user = user
self.user = str(user)
self.password = password
self.private_key_file = private_key_file
self.HASHED_KEY_MAGIC = "|1|"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment