Jeff Forcier
|
a495da760f
|
Merge branch '1.13'
|
2014-03-22 18:26:18 -07:00 |
|
Jeff Forcier
|
87b57dc0cd
|
Expand changelog to include #292
|
2014-03-22 18:26:16 -07:00 |
|
Jeff Forcier
|
1fa5f8239d
|
Merge branch '1.13'
|
2014-03-22 18:25:56 -07:00 |
|
Jeff Forcier
|
0857a817ff
|
Revert "Revert "Add a setup.cfg identifying this package as universal""
This reverts commit 341a666351.
|
2014-03-22 18:25:51 -07:00 |
|
Jeff Forcier
|
8922bbe7d3
|
Revert "Revert "Changelog fixes #290""
This reverts commit bd81c94825.
|
2014-03-22 18:25:45 -07:00 |
|
Jeff Forcier
|
ea88fad0f1
|
Merge branch '1.12' into 1.13
|
2014-03-22 18:24:48 -07:00 |
|
Jeff Forcier
|
4d76a90985
|
Merge branch '1.11' into 1.12
|
2014-03-22 18:24:37 -07:00 |
|
Jeff Forcier
|
bd81c94825
|
Revert "Changelog fixes #290"
This reverts commit 270dacaf33.
|
2014-03-22 18:24:28 -07:00 |
|
Jeff Forcier
|
341a666351
|
Revert "Add a setup.cfg identifying this package as universal"
This reverts commit 61e32319fc.
|
2014-03-22 18:24:21 -07:00 |
|
Jeff Forcier
|
7a3eedcee2
|
Merge branch '1.13'
|
2014-03-22 18:02:29 -07:00 |
|
Jeff Forcier
|
50598d35a1
|
Merge branch '1.12' into 1.13
|
2014-03-22 18:02:29 -07:00 |
|
Jeff Forcier
|
d4e98d8d77
|
Merge branch '1.11' into 1.12
|
2014-03-22 18:02:28 -07:00 |
|
Jeff Forcier
|
270dacaf33
|
Changelog fixes #290
|
2014-03-22 17:59:21 -07:00 |
|
Jeff Forcier
|
3003eaacd8
|
Merge branch '1.13'
|
2014-03-22 17:17:45 -07:00 |
|
Jeff Forcier
|
b0ef41c05d
|
Merge branch '1.12'
|
2014-03-21 18:10:03 -07:00 |
|
Jeff Forcier
|
ff86ec3492
|
Merge branch '1.12' into 1.13
|
2014-03-21 18:09:59 -07:00 |
|
Jeff Forcier
|
c5fff0c399
|
Merge branch '1.11' into 1.12
|
2014-03-21 18:09:56 -07:00 |
Alex Gaynor
|
61e32319fc
|
Add a setup.cfg identifying this package as universal
Meaning that it's build is not system dependent. Which it's not, because it's pure python. Refs #275
|
2014-03-21 18:09:51 -07:00 |
|
Jeff Forcier
|
a8110d8006
|
Real title too large for sidebar
|
2014-03-21 17:32:36 -07:00 |
|
Jeff Forcier
|
a7a0fca1f4
|
Merge branch '1.13'
|
2014-03-21 17:29:44 -07:00 |
|
Jeff Forcier
|
cadb44e79c
|
Merge branch '1.12' into 1.13
|
2014-03-21 17:29:40 -07:00 |
|
Jeff Forcier
|
fb6047df36
|
Merge branch '1.11' into 1.12
|
2014-03-21 17:29:38 -07:00 |
|
Jeff Forcier
|
13cadb2a1f
|
Merge branch '1.10' into 1.11
|
2014-03-21 17:29:35 -07:00 |
|
Jeff Forcier
|
4cc9d9f562
|
Uggh how did this slip in
|
2014-03-21 17:29:31 -07:00 |
|
Jeff Forcier
|
7feeb272a0
|
Uggh how did this slip in
|
2014-03-21 17:28:25 -07:00 |
|
Jeff Forcier
|
6fac5df535
|
Start an FAQ and answer it with a new install section
|
2014-03-21 17:28:19 -07:00 |
|
Jeff Forcier
|
a183cd3bb1
|
Merge branch '1.13'
|
2014-03-21 11:23:13 -07:00 |
|
Jeff Forcier
|
6875bfd795
|
Merge branch '1.12' into 1.13
|
2014-03-21 11:23:09 -07:00 |
|
Jeff Forcier
|
3780c0314c
|
Merge branch '1.11' into 1.12
|
2014-03-21 11:23:06 -07:00 |
|
Jeff Forcier
|
2c0544fc35
|
Changelog re #284
|
2014-03-21 11:23:03 -07:00 |
|
Jeff Forcier
|
e058c6bae0
|
Merge branch '1.13'
|
2014-03-21 11:21:41 -07:00 |
|
Jeff Forcier
|
5c4dceae39
|
NO python 2.5 for 1.13+
|
2014-03-21 11:21:38 -07:00 |
|
Jeff Forcier
|
afff987925
|
Merge branch '1.12' into 1.13
|
2014-03-21 11:21:26 -07:00 |
|
Jeff Forcier
|
4ba5ae6135
|
Merge branch '1.11' into 1.12
|
2014-03-21 11:21:20 -07:00 |
|
Jeff Forcier
|
2af6081eaf
|
Forgot python 2.5
|
2014-03-21 11:21:17 -07:00 |
|
Jeff Forcier
|
a6b38ff5d2
|
Merge branch '1.12' into 1.13
Conflicts:
setup.py
|
2014-03-21 11:20:59 -07:00 |
|
Jeff Forcier
|
a749c83aa8
|
Merge branch '1.11' into 1.12
Conflicts:
setup.py
|
2014-03-21 11:16:51 -07:00 |
|
Jeff Forcier
|
695527c9ee
|
Indent/order shuffle, no actionable changes
|
2014-03-21 11:09:31 -07:00 |
|
Jeff Forcier
|
233f53bb37
|
Backport alex/patch-2, Python trove classifiers
|
2014-03-21 11:06:15 -07:00 |
|
Jeff Forcier
|
ebc1f38611
|
Merge branch 'python3'
|
2014-03-15 15:00:20 -07:00 |
|
Jeff Forcier
|
fe9171661a
|
Merge branch '1.12' into 1.13
Conflicts:
paramiko/file.py
paramiko/server.py
paramiko/sftp_client.py
sites/www/changelog.rst
|
2014-03-13 21:54:12 -07:00 |
|
Jeff Forcier
|
a8ad23e61a
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-03-13 21:52:56 -07:00 |
|
Jeff Forcier
|
9ad2dec32a
|
Improve string type testing in Python 2.x versions
|
2014-03-13 21:52:34 -07:00 |
|
Jeff Forcier
|
e032541b78
|
Changelog for 1.13.0
|
2014-03-13 21:37:02 -07:00 |
|
Jeff Forcier
|
9695500303
|
Merge branch '1.12' into 1.13
Conflicts:
sites/www/changelog.rst
|
2014-03-13 21:36:48 -07:00 |
|
Jeff Forcier
|
b94af130b5
|
Changelog for 1.12.3
|
2014-03-13 21:36:26 -07:00 |
|
Jeff Forcier
|
005cfb8b25
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-03-13 21:36:05 -07:00 |
|
Jeff Forcier
|
4e9efe4830
|
Changelog for 1.11.5
|
2014-03-13 21:35:48 -07:00 |
|
Jeff Forcier
|
1774a4b9c0
|
Merge branch '1.12'
|
2014-03-13 21:30:21 -07:00 |
|
Jeff Forcier
|
bbd9469d65
|
Cut 1.12.3
|
2014-03-13 21:30:11 -07:00 |