summaryrefslogtreecommitdiffhomepage
AgeCommit message (Expand)Author
2017-01-24Merge branch '2.0' into 2.1Jeff 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-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 '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
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
2016-12-12Revert "Add timeout to Transport.start_client()"Jeff Forcier
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
2016-12-09Merge branch '1.18' into 2.0Jeff Forcier
2016-12-09Cut 1.18.0Jeff Forcier
2016-12-09Merge branch '1.17' into 1.18Jeff Forcier
2016-12-09Cut 1.17.3Jeff Forcier
2016-12-09Weave in newer release invocations tasksJeff Forcier
2016-12-05Merge branch '2.0'Jeff Forcier
2016-12-05Merge branch '1.18' into 2.0Jeff Forcier
2016-12-05Merge branch '1.17' into 1.18Jeff Forcier
2016-12-05Looks like skipIf was added in 2.7? Dies on 2.6Jeff Forcier