diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:10:58 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:10:58 -0700 |
| commit | 7f2521da8f7dc2956f732e6f0c1251e136837d5e (patch) | |
| tree | d4838fc852585f3f2e231c54796cd7477358b937 | |
| parent | b58beb4dd0211092e352fd01af0be5e6550c9db5 (diff) | |
| parent | 0e1cd71a75e0ffca549285fab9acd6f169254ffe (diff) | |
| download | paramiko-7f2521da8f7dc2956f732e6f0c1251e136837d5e.tar.gz | |
Merge branch '2.0' into 2.1
| -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 0ed3e587..0f02c3d5 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:`1061` Clean up GSSAPI authentication procedures so they do not prevent normal fallback to other authentication methods on failure. (In other words, |