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

150 Commits

Author SHA1 Message Date
Jeff Forcier 196b3cc110 Merge branch '1.12' into 1.13 2014-03-31 16:19:55 -07:00
Jeff Forcier 619b24738a Merge branch '1.11' into 1.12 2014-03-31 16:19:55 -07:00
Jeff Forcier 9044860b41 Merge branch '1.10' into 1.11 2014-03-31 16:19:55 -07:00
Jeff Forcier c9aa83b63e Link back to WWW in docs sidebar 2014-03-31 16:19:40 -07:00
Jeff Forcier 87b57dc0cd Expand changelog to include #292 2014-03-22 18:26:16 -07:00
Jeff Forcier 8922bbe7d3 Revert "Revert "Changelog fixes #290"" 
This reverts commit bd81c94825.
 2014-03-22 18:25:45 -07:00
Jeff Forcier ea88fad0f1 Merge branch '1.12' into 1.13 2014-03-22 18:24:48 -07:00
Jeff Forcier 4d76a90985 Merge branch '1.11' into 1.12 2014-03-22 18:24:37 -07:00
Jeff Forcier bd81c94825 Revert "Changelog fixes #290" 
This reverts commit 270dacaf33.
 2014-03-22 18:24:28 -07:00
Jeff Forcier 50598d35a1 Merge branch '1.12' into 1.13 2014-03-22 18:02:29 -07:00
Jeff Forcier d4e98d8d77 Merge branch '1.11' into 1.12 2014-03-22 18:02:28 -07:00
Jeff Forcier 270dacaf33 Changelog fixes #290 2014-03-22 17:59:21 -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 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 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 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 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
Jeff Forcier 073c71a822 Attempt to fix docs for py3 2014-03-07 18:46:40 -08:00
Jeff Forcier 7a776b1757 Testing out intersphinx in changelog 2014-03-04 17:43:30 -08:00
Jeff Forcier 32975af9a6 Merge branch '1.12' 2014-03-04 16:16:38 -08:00
Jeff Forcier 38785d9cd2 Merge branch '1.11' into 1.12 2014-03-04 16:16:36 -08:00
Jeff Forcier d5ed558c21 Merge branch '1.10' into 1.11 2014-03-04 16:16:33 -08:00
Jeff Forcier 798e3689dd Note Sphinx docs issue was backported 2014-03-04 16:16:29 -08:00
Jeff Forcier f9fef01e76 Merge branch '1.12' 2014-03-04 15:56:49 -08:00
Jeff Forcier 247ef7f6f7 Merge branch '1.11' into 1.12 2014-03-04 15:56:46 -08:00
Jeff Forcier 8f22672926 Merge branch '1.10' into 1.11 2014-03-04 15:54:16 -08:00
Jeff Forcier f295840191 Semi no-op fix to test RTD hooks 2014-03-04 15:45:01 -08:00
Jeff Forcier b9cea90581 Merge branch '1.12' 2014-03-04 11:45:12 -08:00
Jeff Forcier fac6cde874 Merge branch '1.11' into 1.12 
Conflicts:
	paramiko/hostkeys.py
 2014-03-04 11:44:57 -08:00
Jeff Forcier 72a73f55fa Merge branch '1.10' into 1.11 
Conflicts:
	fabfile.py
	paramiko/__init__.py
 2014-03-03 18:24:04 -08:00
Jeff Forcier 056323979d Re-enable Intersphinx from www -> docs 2014-03-03 18:22:33 -08:00
Jeff Forcier 83f09e634f Changelog re #256 2014-03-03 17:30:15 -08:00
Jeff Forcier 9ae46dcbfa Fix up AgentSSH vs Agent classes/docstrings, sigh 2014-02-24 17:00:53 -08:00
Jeff Forcier 4bcac18d17 Host key docs (order + tweaks) 2014-02-24 10:08:46 -08:00
Jeff Forcier 24cc59b64d Reorder config doc 2014-02-24 10:01:03 -08:00
Jeff Forcier c23579526b Tweak order of System doc page 2014-02-24 09:49:30 -08:00