summaryrefslogtreecommitdiffhomepage
AgeCommit message (Expand)Author
2017-01-25Merge branch '2.0' into 2.1Jeff Forcier
2017-01-25Merge branch '2.1'Jeff Forcier
2017-01-25Added bytes as type to writeKalle Møller
2017-01-25Merge branch '1.17' into 1.18Jeff Forcier
2017-01-25Added bytes as type to writeKalle Møller
2017-01-24Merge branch '2.0' into 2.1Jeff Forcier
2017-01-24Merge branch '2.1'Jeff Forcier
2017-01-24untie agian!james mike dupont
2017-01-24Merge branch '1.17' into 1.18Jeff Forcier
2017-01-24untie agian!james mike dupont
2017-01-18Merge branch '2.0' into 2.1Jeff Forcier
2017-01-18Merge branch '2.1'Jeff Forcier
2017-01-18Update channel.pyJames Michael DuPont
2017-01-18Merge branch '1.17' into 1.18Jeff Forcier
2017-01-18Update channel.pyJames Michael DuPont
2017-01-01Merge branch '2.0' into 2.1Jeff Forcier
2017-01-01Merge branch '2.1'Jeff Forcier
2017-01-01Merge branch '1.18' into 2.0Jeff Forcier
2017-01-01Merge branch '1.17' into 1.18Jeff Forcier
2017-01-01Happy New YearJeff Forcier
2017-01-01Happy New YearJeff Forcier
2016-12-23Added changelog entryTim Savage
2016-12-23Added a test to check that the auth_timeout argument is passed through and ap...Tim Savage
2016-12-23Fixed test to support python 2.6Tim Savage
2016-12-23Added test for authentication timeout from a non-responsive serverTim Savage
2016-12-23Increased auth_timeout to 30 secondsTim Savage
2016-12-22Incorrect comparison, should be <=Tim Savage
2016-12-22Added a auth_timeout to handle situations where SSH server stops responding d...Tim Savage
2016-12-19Merge branch '2.0' into 2.1Jeff Forcier
2016-12-19Merge branch '1.18' into 2.0Jeff Forcier
2016-12-19Merge branch '1.17' into 1.18Jeff Forcier
2016-12-19Changelog closes #866, closes #838Jeff Forcier
2016-12-19remove broken tox testing configPierce Lopez
2016-12-19also test with pypy on Travis CIPierce Lopez
2016-12-12Cut 2.1.1Jeff Forcier
2016-12-12Merge branch '2.0' into 2.1Jeff Forcier
2016-12-12Cut 2.0.4Jeff Forcier
2016-12-12Merge branch '1.18' into 2.0Jeff Forcier
2016-12-12Cut 1.18.1Jeff Forcier
2016-12-12Merge branch '2.0' into 2.1Jeff Forcier
2016-12-12Merge branch '1.18' into 2.0Jeff Forcier
2016-12-12GRUMPJeff Forcier
2016-12-12Merge branch '2.0' into 2.1Jeff Forcier
2016-12-12MehJeff Forcier
2016-12-12Merge branch '2.0' into 2.1Jeff Forcier
2016-12-12See if this worksJeff Forcier
2016-12-12Merge branch '2.0' into 2.1Jeff Forcier
2016-12-12Changelog re d4a5806d23e95cc386d88a361956d0e0c1df9fb6Jeff Forcier
2016-12-12Merge branch '2.0' into 2.1Jeff Forcier
2016-12-12Remove code re #398 from 2.0 branch, as it's feature workJeff Forcier