summaryrefslogtreecommitdiffhomepage
path: root/sites
AgeCommit message (Collapse)Author
2015-02-24Patch resolving the timeout issue on lost conection.Olle Lundberg
(This rolls in patch in #439)
2015-02-24Expose handshake timeout in the transport API.Olle Lundberg
This is a reimplementation of #62.
2015-02-04Changelog fixes #402, closes #479Jeff Forcier
2014-12-19Cut 1.15.2Jeff Forcier
2014-12-19Merge branch '1.14' into 1.15Jeff Forcier
2014-12-19Cut 1.14.2Jeff Forcier
2014-12-19Merge branch '1.13' into 1.14Jeff Forcier
2014-12-19Cut 1.13.3Jeff Forcier
2014-12-18Mark more backported support issues as suchJeff Forcier
2014-12-18Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-18Merge branch '1.13' into 1.14Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-18Mark some backported support items as suchJeff Forcier
2014-12-18Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-18Merge branch '1.13' into 1.14Jeff Forcier
2014-12-18Fix busted changelog indentJeff Forcier
2014-12-18Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-18Merge branch '1.13' into 1.14Jeff Forcier
2014-12-18Changelog re #413, closes #454Jeff Forcier
2014-12-17Changelog closes #455Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog closes #428Jeff Forcier
2014-12-17Changelog re #415Jeff Forcier
2014-12-17Dyslexia strikes again. Actually close #431, not #413Jeff Forcier
2014-12-17Changelog closes #413Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog closes #422Jeff Forcier
2014-12-17Changelog re #421, closes #421Jeff Forcier
2014-12-17Changelog re #419, closes #419Jeff Forcier
2014-12-17Merge branch '1.15'Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: paramiko/transport.py
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog re #266Jeff Forcier
2014-12-17Merge branch '1.15'Jeff Forcier
2014-12-17Merge branch '1.14' into 1.15Jeff Forcier
2014-12-17Merge branch '1.13' into 1.14Jeff Forcier
2014-12-17Changelog re #459Jeff Forcier
2014-11-12Merge branch '1.15'Jeff Forcier
2014-11-12Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: tests/test_util.py
2014-11-12Merge branch '1.13' into 1.14Jeff Forcier
2014-11-12Changelog re #429Jeff Forcier
2014-10-01Merge branch '1.15'Jeff Forcier
2014-10-01Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-10-01Merge branch '1.13' into 1.14Jeff Forcier
2014-10-01Changelog re #320Jeff Forcier
Closes #409
2014-09-22Merge branch '1.15'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-09-22Cut 1.15.1Jeff Forcier
2014-09-22Changelog re #399Jeff Forcier
2014-09-19Changelog re #167Jeff Forcier