Permalink
Browse files

Merge branch '1.13' into 1.14

  • Loading branch information...
bitprophet committed Oct 18, 2017
2 parents ecb588b + 1dcfecd commit 53f5499bc9be2a0f6124507cee8ac5e08ad42658
Showing with 5 additions and 0 deletions.
  1. +3 −0 setup.cfg
  2. +2 −0 sites/www/changelog.rst
View
@@ -1,2 +1,5 @@
[flake8]
exclude = tests/support,tests/Python26SocketServer.py,sites,fabric/api.py
[metadata]
license_file = LICENSE
View
@@ -2,6 +2,8 @@
Changelog
=========
* :support:`- backported` Update packaging metadata so wheel archives include
the ``LICENSE`` file.
* :release:`1.14.0 <2017-08-25>`
* :feature:`1475` Honor ``env.timeout`` when opening new remote sessions (as
opposed to the initial overall connection, which already honored timeout

0 comments on commit 53f5499

Please sign in to comment.