dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,293 Commits 8 Branches 20 Tags 3.3 MiB
Commit Graph

1293 Commits

Author SHA1 Message Date
Jeff Forcier a7a0fca1f4 Merge branch '1.13' 2014-03-21 17:29:44 -07:00
Jeff Forcier cadb44e79c Merge branch '1.12' into 1.13 2014-03-21 17:29:40 -07:00
Jeff Forcier fb6047df36 Merge branch '1.11' into 1.12 2014-03-21 17:29:38 -07:00
Jeff Forcier 13cadb2a1f Merge branch '1.10' into 1.11 2014-03-21 17:29:35 -07:00
Jeff Forcier 4cc9d9f562 Uggh how did this slip in 2014-03-21 17:29:31 -07:00
Jeff Forcier 7feeb272a0 Uggh how did this slip in 2014-03-21 17:28:25 -07:00
Jeff Forcier 6fac5df535 Start an FAQ and answer it with a new install section 2014-03-21 17:28:19 -07:00
Jeff Forcier a183cd3bb1 Merge branch '1.13' 2014-03-21 11:23:13 -07:00
Jeff Forcier 6875bfd795 Merge branch '1.12' into 1.13 2014-03-21 11:23:09 -07:00
Jeff Forcier 3780c0314c Merge branch '1.11' into 1.12 2014-03-21 11:23:06 -07:00
Jeff Forcier 2c0544fc35 Changelog re #284 2014-03-21 11:23:03 -07:00
Jeff Forcier e058c6bae0 Merge branch '1.13' 2014-03-21 11:21:41 -07:00
Jeff Forcier 5c4dceae39 NO python 2.5 for 1.13+ 2014-03-21 11:21:38 -07:00
Jeff Forcier afff987925 Merge branch '1.12' into 1.13 2014-03-21 11:21:26 -07:00
Jeff Forcier 4ba5ae6135 Merge branch '1.11' into 1.12 2014-03-21 11:21:20 -07:00
Jeff Forcier 2af6081eaf Forgot python 2.5 2014-03-21 11:21:17 -07:00
Jeff Forcier a6b38ff5d2 Merge branch '1.12' into 1.13 
Conflicts:
	setup.py
 2014-03-21 11:20:59 -07:00
Jeff Forcier a749c83aa8 Merge branch '1.11' into 1.12 
Conflicts:
	setup.py
 2014-03-21 11:16:51 -07:00
Jeff Forcier 695527c9ee Indent/order shuffle, no actionable changes 2014-03-21 11:09:31 -07:00
Jeff Forcier 233f53bb37 Backport alex/patch-2, Python trove classifiers 2014-03-21 11:06:15 -07:00
Jeff Forcier ebc1f38611 Merge branch 'python3' 2014-03-15 15:00:20 -07:00
Jeff Forcier fe9171661a Merge branch '1.12' into 1.13 
Conflicts:
	paramiko/file.py
	paramiko/server.py
	paramiko/sftp_client.py
	sites/www/changelog.rst
 2014-03-13 21:54:12 -07:00
Jeff Forcier a8ad23e61a Merge branch '1.11' into 1.12 
Conflicts:
	sites/www/changelog.rst
 2014-03-13 21:52:56 -07:00
Jeff Forcier 9ad2dec32a Improve string type testing in Python 2.x versions 2014-03-13 21:52:34 -07:00
Jeff Forcier e032541b78 Changelog for 1.13.0 2014-03-13 21:37:02 -07:00
Jeff Forcier 9695500303 Merge branch '1.12' into 1.13 
Conflicts:
	sites/www/changelog.rst
 2014-03-13 21:36:48 -07:00
Jeff Forcier b94af130b5 Changelog for 1.12.3 2014-03-13 21:36:26 -07:00
Jeff Forcier 005cfb8b25 Merge branch '1.11' into 1.12 
Conflicts:
	sites/www/changelog.rst
 2014-03-13 21:36:05 -07:00
Jeff Forcier 4e9efe4830 Changelog for 1.11.5 2014-03-13 21:35:48 -07:00
Jeff Forcier 1774a4b9c0 Merge branch '1.12' 2014-03-13 21:30:21 -07:00
Jeff Forcier bbd9469d65 Cut 1.12.3 2014-03-13 21:30:11 -07:00
Jeff Forcier edf958b74b Merge branch '1.11' into 1.12 2014-03-13 21:29:19 -07:00
Jeff Forcier c538a00012 Merge branch '1.10' into 1.11. 
Also bump versions like a dummy.

Conflicts:
	paramiko/__init__.py
	setup.py
 2014-03-13 21:27:46 -07:00
Jeff Forcier 4fdb4b5ae5 Cut 1.10.7 2014-03-13 21:25:44 -07:00
Jeff Forcier bd532e4a69 Bump releases version to 0.5.2 for better changelog 2014-03-13 21:20:25 -07:00
Jeff Forcier 0424f2c4c9 Merge pull request #276 from paramiko/python3 
Merged-to-master Python 3 branch
 2014-03-13 21:08:55 -07:00
Jeff Forcier d99342d119 README py3 update 2014-03-13 21:06:57 -07:00
Jeff Forcier 4742f4c1c1 Update copyright in README to be more accurate 2014-03-13 21:06:14 -07:00
Jeff Forcier b0b6a827b9 Update docs to reflect Python 2.6+, 3.3+ compat 2014-03-13 21:05:32 -07:00
Jeff Forcier a4645b0c9c New Alabaster for improved py2/3 + changelog style tweak 2014-03-13 20:45:03 -07:00
Jeff Forcier ba55eea38d Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into python3 2014-03-13 11:19:04 -07:00
Jeff Forcier 120071283d Fix accidental Markdown formatting miss for an older entry 2014-03-13 11:15:34 -07:00
Jeff Forcier 8463053fa5 Add changelog re #16 2014-03-13 11:15:20 -07:00
Scott Maxwell 386384a498 Remove dead Py2.2 code and fix a bunch of PEP8 formatting 2014-03-08 08:59:25 -08:00
Scott Maxwell f0017b8330 Fix import * and a bunch of PEP8 formatting 2014-03-07 20:45:26 -08:00
Jeff Forcier 073c71a822 Attempt to fix docs for py3 2014-03-07 18:46:40 -08:00
Jeff Forcier 71e8ddef2b Remove race condition regression re #276 2014-03-07 16:24:32 -08:00
Jeff Forcier b4cd4bea1d Start in on star import eradication 2014-03-07 16:17:19 -08:00
Jeff Forcier b29d018e36 Remove an old Py2.5-ism 2014-03-07 15:10:35 -08:00
Jeff Forcier 1b5332ead1 Skip failing test on Py3 2014-03-07 14:31:52 -08:00