diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:11:01 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:11:01 -0700 |
| commit | 601467f5b4d5927a8a672679b18da8ee58c13e2f (patch) | |
| tree | dd5dbee997a1e9d1f02460913e5bf4fdc05c1e69 | |
| parent | d6208bf892c380f439aa01679e95bafd6c380504 (diff) | |
| parent | 7f2521da8f7dc2956f732e6f0c1251e136837d5e (diff) | |
Merge branch '2.1' into 2.2
| -rw-r--r-- | dev-requirements.txt | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 716f432d..41fea798 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -8,5 +8,5 @@ alabaster>=0.7.5,<2.0 releases>=1.1.0,<2.0 semantic_version<3.0 wheel==0.24 -twine==1.5 +twine==1.9.1 flake8==2.6.2 diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index b3609fe1..81621e69 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`2.0.7 <2017-09-18>` * :release:`1.18.4 <2017-09-18>` * :bug:`1065` Add rekeying support to GSSAPI connections, which was erroneously missing. Without this fix, any attempt to renegotiate the transport keys for |