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
|
c538a00012
|
Merge branch '1.10' into 1.11.
Also bump versions like a dummy.
Conflicts:
paramiko/__init__.py
setup.py
|
2014-03-13 21:27:46 -07:00 |
|
Jeff Forcier
|
4fdb4b5ae5
|
Cut 1.10.7
|
2014-03-13 21:25:44 -07:00 |
|
Jeff Forcier
|
38785d9cd2
|
Merge branch '1.11' into 1.12
|
2014-03-04 16:16:36 -08:00 |
|
Jeff Forcier
|
d5ed558c21
|
Merge branch '1.10' into 1.11
|
2014-03-04 16:16:33 -08:00 |
|
Jeff Forcier
|
798e3689dd
|
Note Sphinx docs issue was backported
|
2014-03-04 16:16:29 -08:00 |
|
Jeff Forcier
|
fac6cde874
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
|
2014-03-04 11:44:57 -08:00 |
|
Jeff Forcier
|
72a73f55fa
|
Merge branch '1.10' into 1.11
Conflicts:
fabfile.py
paramiko/__init__.py
|
2014-03-03 18:24:04 -08:00 |
|
Jeff Forcier
|
056323979d
|
Re-enable Intersphinx from www -> docs
|
2014-03-03 18:22:33 -08:00 |
|
Jeff Forcier
|
83f09e634f
|
Changelog re #256
|
2014-03-03 17:30:15 -08:00 |
|
Jeff Forcier
|
0965eaa65d
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
sites/www/changelog.rst
|
2014-02-14 11:54:39 -08:00 |
|
Jeff Forcier
|
4e9af2f7ca
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-02-14 11:53:59 -08:00 |
|
Jeff Forcier
|
30518280f1
|
Changelog re hash comparison bugfix
|
2014-02-14 11:53:42 -08:00 |
|
Jeff Forcier
|
fb786bea9c
|
Cut 1.12.2
|
2014-02-14 09:39:11 -08:00 |
|
Jeff Forcier
|
33d412a2c6
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/__init__.py
setup.py
|
2014-02-14 09:38:40 -08:00 |
|
Jeff Forcier
|
4a5f007c02
|
Cut 1.11.4
|
2014-02-14 09:38:14 -08:00 |
|
Jeff Forcier
|
7b595f4a8b
|
Merge branch '1.10' into 1.11
Conflicts:
paramiko/__init__.py
setup.py
sites/www/changelog.rst
|
2014-02-14 09:37:34 -08:00 |
|
Jeff Forcier
|
457a34f55b
|
Cut 1.10.6
|
2014-02-14 09:36:33 -08:00 |
|
Jeff Forcier
|
ddea189319
|
Merge branch '1.11' into 1.12
|
2014-02-14 09:32:08 -08:00 |
|
Jeff Forcier
|
6d4b37a17f
|
Catch & patch trimming
|
2014-02-14 09:32:05 -08:00 |
|
Jeff Forcier
|
758543f238
|
Merge branch '1.11' into 1.12
|
2014-02-14 09:16:43 -08:00 |
|
Jeff Forcier
|
fb772a8695
|
Tweak changelog language
|
2014-02-14 09:16:35 -08:00 |
|
Jeff Forcier
|
e3a16fac5a
|
Braino in changelog text
|
2014-02-13 13:48:21 -08:00 |
|
Jeff Forcier
|
8003c738ca
|
I hate you sometimes, ReST
|
2014-02-13 09:50:05 -08:00 |
|
Jeff Forcier
|
c3eb903ed3
|
Preliminary changelog entry re #252
|
2014-02-13 09:48:58 -08:00 |
|
Jeff Forcier
|
0c493541eb
|
Changelog re #268
|
2014-02-13 09:40:53 -08:00 |
|
Jeff Forcier
|
3a7b66a814
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-02-11 14:26:34 -08:00 |
|
Jeff Forcier
|
41d7339992
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-02-11 14:23:50 -08:00 |
|
Jeff Forcier
|
c142454621
|
Start reverting explicit-release stuff in favor of release-line specifiers on bugs.
|
2014-02-11 14:23:15 -08:00 |
|
Jeff Forcier
|
36b937d436
|
Merge branch '1.10' into 1.11
|
2014-02-11 09:48:00 -08:00 |
|
Jeff Forcier
|
0a2887a8cc
|
Changelog re #35
|
2014-02-10 17:59:32 -08:00 |
|
Jeff Forcier
|
fe3d3beca4
|
Fix extra colon in changelog
|
2014-02-10 17:59:25 -08:00 |
|
Jeff Forcier
|
c7090c52de
|
Merge branch '1.11' into 1.12
|
2014-02-03 14:11:00 -08:00 |
|
Jeff Forcier
|
36abefdac0
|
Merge branch '1.10' into 1.11
|
2014-02-03 14:10:58 -08:00 |
|
Jeff Forcier
|
0f2fb26287
|
Update to new Alabaster version for footer/extension stuff
|
2014-02-03 14:09:56 -08:00 |
|
Jeff Forcier
|
792cfe0cf6
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-01-30 14:32:22 -08:00 |
|
Jeff Forcier
|
0a90bef4f4
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-01-30 14:32:10 -08:00 |
|
Jeff Forcier
|
4aa9668653
|
Don't preseed releases, ugh
|
2014-01-30 14:31:59 -08:00 |
|
Jeff Forcier
|
5aa0d401f6
|
Merge branch '1.11' into 1.12
|
2014-01-30 14:29:19 -08:00 |
|
Jeff Forcier
|
397cd4ce99
|
Merge branch '1.10' into 1.11
|
2014-01-30 14:29:16 -08:00 |
|
Jeff Forcier
|
55722240b5
|
Fix broken link format
|
2014-01-30 14:20:13 -08:00 |
|
Jeff Forcier
|
52183257d0
|
Remove blog link for now
|
2014-01-30 14:20:04 -08:00 |
|
Jeff Forcier
|
343d0492a7
|
Backport changelog bugfix from 1.12
|
2014-01-30 10:57:06 -08:00 |
|
Jeff Forcier
|
70bcde95c1
|
Backport changelog bugfix from 1.12
|
2014-01-30 10:56:03 -08:00 |
|
Jeff Forcier
|
5ba3761f21
|
Fix some boogs in changelog
|
2014-01-30 10:55:10 -08:00 |
|
Jeff Forcier
|
14929d6909
|
1.12 releases
|
2014-01-30 10:45:00 -08:00 |
|
Jeff Forcier
|
a83f0d3038
|
Add rest of 1.11 releases
|
2014-01-30 10:40:29 -08:00 |
|
Jeff Forcier
|
d0d711ac78
|
Port 1.11.1
|
2014-01-29 15:20:53 -08:00 |
|
Jeff Forcier
|
176493823c
|
Missed a spot w/ SnR
|
2014-01-29 15:16:09 -08:00 |