summaryrefslogtreecommitdiffhomepage
path: root/sites/www
AgeCommit message (Collapse)Author
2016-04-24crypto our cryptoAlex Gaynor
2016-04-24Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Merge branch '1.15' into 1.16Jeff Forcier
2016-04-24Changelog closes #729Jeff Forcier
2016-04-24Changelog re #649Jeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Be clearerJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Apparently a whole lot of people noticed that tiny python 3 issueJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Oh hey this also fixes the only other open 1.16.1 ticket yeyJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Changelog re #617, #679, #678, #685.Jeff Forcier
Also re https://github.com/fabric/fabric/issues/1429 but IDK if Github will tickle that repo correctly :D
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Changelog re #619, re #613Jeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Merge branch '1.15' into 1.16Jeff Forcier
2016-04-24Expose some effectively-public Channel attributes in API docs.Jeff Forcier
Closes #621
2016-04-23Merge branch '1.16'Jeff Forcier
2016-04-23Merge branch '1.15' into 1.16Jeff Forcier
2016-04-23MehJeff Forcier
2016-04-23Changelog closes #632Jeff Forcier
2016-04-23Merge branch '1.16'Jeff Forcier
2016-04-23Merge branch '1.15' into 1.16Jeff Forcier
2016-04-23Fix broken changelog doc linkJeff Forcier
2016-04-23Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-04-22Merge branch '1.15' into 1.16Jeff Forcier
2016-04-22Merge branch '1.16'Jeff Forcier
2016-04-22Hack in a sleep() to avoid race conditions during timeout test.Jeff Forcier
(HOPEFULLY) closes #612
2016-02-27Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-02-27Merge branch '1.15' into 1.16Jeff Forcier
2016-02-27Merge branch '1.16'Jeff Forcier
2016-02-27Merge branch '1.14' into 1.15Jeff Forcier
2016-02-27Merge branch '1.13' into 1.14Jeff Forcier
2016-02-27Changelog re #697Jeff Forcier
2016-01-19Merge branch '1.15' into 1.16Jeff Forcier
2016-01-19Merge branch '1.16'Jeff Forcier
2016-01-19Merge branch '1.14' into 1.15Jeff Forcier
2016-01-19Merge branch '1.13' into 1.14Jeff Forcier
2016-01-19Changelog re #499, re #656Jeff Forcier
Closes #499
2016-01-01Merge branch '1.16'Jeff Forcier
2016-01-01Merge branch '1.15' into 1.16Jeff Forcier
2016-01-01Changelog re #652Jeff Forcier
2015-12-18Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2015-12-17Fix up changelog entry to be on specJeff Forcier
2015-12-17Merge branch 'master' of github.com:paramiko/paramikoAdam Meily
Conflicts: paramiko/sftp_file.py sites/www/changelog.rst
2015-12-16Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2015-12-10Merge branch '1.15' into 1.16Jeff Forcier
2015-12-10Merge branch '1.13' into 1.14Jeff Forcier