##// END OF EJS Templates
Merge pull request #1568 from minrk/fixssh...
Merge pull request #1568 from minrk/fixssh fix PR #1567 PR #1567 fixed an issue where ssh server would not recognize custom ssh server ports. However, it broke another case by forcing local username if it is unspecified. ssh config should be trusted with the default username.

File last commit:

r1234:52b55407
r6432:f30a5729 merge
Show More
__init__.py
10 lines | 558 B | text/x-python | PythonLexer
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # encoding: utf-8
__docformat__ = "restructuredtext en"
#-------------------------------------------------------------------------------
# Copyright (C) 2005 Fernando Perez <fperez@colorado.edu>
# Brian E Granger <ellisonbg@gmail.com>
# Benjamin Ragan-Kelley <benjaminrk@gmail.com>
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-------------------------------------------------------------------------------