summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2017-02-20Merge branch '2.0' into 2.1Jeff Forcier
2017-02-20Not sure how this got overlooked in the cherrypicking, ugh @ myselfJeff Forcier
2017-02-20Merge branch '2.0' into 2.1Jeff Forcier
2017-02-20Update a whole bunch of changelog entries lacking proper version statements =/Jeff Forcier
Grump, for now support types need both 'backported' and version spec?
2017-02-20Merge branch '2.0' into 2.1Jeff Forcier
2017-02-20Changelog re #713, re #714, re #889Jeff Forcier
2017-02-19Merge branch '2.0' into 2.1Jeff Forcier
2017-02-19Changelog re #895, closes #895Jeff Forcier
2017-02-19Fix bug in handling multiple interactive queriesDennis Kaarsemaker
If repeated interaction is needed, check_auth_interactive_response returns an InteractiveQuery object. Unfortunately a bug caused it not to be recognized, causing autheintication to fail. This fixes said bug by properly looking at the type of the returned object.
2017-02-03Merge branch '2.0' into 2.1Jeff Forcier
2017-02-03Update .travis.ymlKalle Møller
3.6 is now released
2017-01-25Merge branch '2.0' into 2.1Jeff Forcier
2017-01-25Added bytes as type to writeKalle Møller
Small change so that my IDE stops telling me, that this function doesn't understand bytes :)
2017-01-24Merge branch '2.0' into 2.1Jeff Forcier
2017-01-24untie agian!james mike dupont
2017-01-18Merge branch '2.0' into 2.1Jeff Forcier
2017-01-18Update channel.pyJames Michael DuPont
2017-01-01Merge branch '2.0' into 2.1Jeff 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
2016-12-19Merge branch '2.0' into 2.1Jeff Forcier
# Conflicts: # sites/www/changelog.rst
2016-12-19Merge branch '1.18' into 2.0Jeff Forcier
# Conflicts: # sites/www/changelog.rst # tox-requirements.txt # tox.ini
2016-12-19Merge branch '1.17' into 1.18Jeff Forcier
# Conflicts: # sites/www/changelog.rst
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
2016-12-12Revert "Add timeout to Transport.start_client()"Jeff Forcier
This reverts commit 5c7f30be9737f73fd024a23f5db0b6a7578026b6.
2016-12-12Merge branch '1.18' into 2.1Jeff Forcier
2016-12-12Changelog re #859, re #860Jeff Forcier
2016-12-12Fixing invoke_shell reference to obsolete update_environment_variablesKirk Byers
2016-12-09Cut 2.1.0Jeff Forcier
2016-12-09Merge branch '2.0'Jeff Forcier
2016-12-09Cut 2.0.3Jeff Forcier