summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '1.16' into 1.17v1.17.01.17.0Jeff Forcier2016-04-281-23/+14
|\
| * Merge branch '1.15' into 1.16v1.16.11.16.1Jeff Forcier2016-04-281-23/+14
| |\
| | * Really not interested in managing dependencies in 2-3 places.v1.15.51.15.5Jeff Forcier2016-04-281-23/+14
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-281-2/+1
|\ \ \ | |/ /
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-281-2/+1
| |\ \ | | |/
| | * Pushed regular versions of all tags so this is no longer neededJeff Forcier2016-04-281-2/+1
* | | Annotate bug 649 with major keyword againJeff Forcier2016-04-281-3/+3
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-281-14/+15
|\ \ \ | |/ /
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-281-12/+13
| |\ \ | | |/
| | * Keep the big posse of backported supports out of 2.0Jeff Forcier2016-04-281-12/+13
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-281-13/+13
| |\ \ | | |/
| | * Update backported support items with both keywords and specs.Jeff Forcier2016-04-281-13/+13
* | | date bumpJeff Forcier2016-04-281-1/+1
* | | Mark the 1.17-specific features so they show up in that releaseJeff Forcier2016-04-281-4/+4
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-282-10/+11
|\ \ \ | |/ /
| * | date bumpJeff Forcier2016-04-281-1/+1
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-282-9/+10
| |\ \ | | |/
| | * Bring alabaster req in line with newer branchesJeff Forcier2016-04-281-1/+1
| | * Update some backported support tickets as 1.15+Jeff Forcier2016-04-281-6/+7
| | * Really hope this date sticksJeff Forcier2016-04-281-1/+1
| | * Update releases/semantic_version dependencies re: major version workJeff Forcier2016-04-281-2/+2
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-253-6/+49
|\ \ \ | |/ /
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-253-6/+49
| |\ \ | | |/
| | * Changelog closes #670Jeff Forcier2016-04-251-0/+6
| | * Test & implementation for part 1 re: #670Jeff Forcier2016-04-252-6/+43
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-251-2/+2
|\ \ \ | |/ /
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-251-2/+2
| |\ \ | | |/
| | * Neglected to mark a bug 1.15+.Jeff Forcier2016-04-251-2/+2
* | | Reinstate 1.17.0 release lineJeff Forcier2016-04-251-0/+1
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-251-0/+2
|\ \ \ | |/ /
| * | Reinstate 1.16.1 release lineJeff Forcier2016-04-251-0/+1
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-251-0/+1
| |\ \ | | |/
| | * Reinstate release line for 1.15.5Jeff Forcier2016-04-251-0/+1
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-252-1/+22
|\ \ \ | |/ /
| * | Reword/link changelog re #677, re #676Jeff Forcier2016-04-251-2/+5
| * | Expand SFTPFile.prefetch docstring re #562, re #677Jeff Forcier2016-04-251-1/+13
| * | paramiko.sftp_file.prefetch now backwards compatible[Stephen D. Van Hooser]2016-04-251-1/+1
| * | paramiko.sftp_file.prefetch now backwards compatible[Stephen D. Van Hooser]2016-04-251-1/+1
| * | paramiko.sftp_file.prefetch now backwards compatible[Stephen D. Van Hooser]2016-04-252-2/+8
* | | Undo release lines pending #730Jeff Forcier2016-04-241-3/+0
|\ \ \ | |/ /
| * | Undo release lines pending #730Jeff Forcier2016-04-241-2/+0
| |\ \ | | |/
| | * Undo release line pending #730Jeff Forcier2016-04-241-1/+0
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-241-0/+2
|\ \ \ | |/ /
| * | Cut 1.16.1Jeff Forcier2016-04-242-1/+2
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-241-0/+1
| |\ \ | | |/
| | * Cut 1.15.5Jeff Forcier2016-04-242-1/+2
* | | Merge branch '1.16' into 1.17Jeff Forcier2016-04-243-17/+28
|\ \ \ | |/ /
| * | Merge branch '1.15' into 1.16Jeff Forcier2016-04-243-18/+29
| |\ \ | | |/
| | * Changelog closes #578Jeff Forcier2016-04-241-0/+3
| | * don't use has_key()Stephen C. Pope2016-04-241-1/+1