summaryrefslogtreecommitdiffhomepage
path: root/NEWS
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-07-26 15:06:58 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-07-26 15:06:58 -0700
commitd2c71ed9994baa167f7eaf26683f17a0be4b7c02 (patch)
tree3d15d02bb16999b6f773426f82e26ccd8695173d /NEWS
parentcaf94786ca8c0bc9e3995da0a160c84921a3bfc6 (diff)
parent965d00dee951ffaee7458c7f8cb0a3c38ff46b25 (diff)
Merge branch '1.10'
Conflicts: NEWS setup.py
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS12
1 files changed, 6 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index ef85effe..7365e4d7 100644
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/.
Releases
========
-v1.11.0 (DD MM YYYY)
---------------------
+v1.11.0 (26th Jul 2013)
+-----------------------
* #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now
creates the shared memory map with explicit Security Attributes of the user,
@@ -29,11 +29,11 @@ v1.11.0 (DD MM YYYY)
against duplicate entries during subsequent `known_hosts` loads.) Thanks to
`@sunweaver` for the contribution.
-v1.10.2 (DD MM 2013)
---------------------
+v1.10.2 (26th Jul 2013)
+-----------------------
-* #153, #67: Warn on parse failure when reading known_hosts
- file. Thanks to `@glasserc` for patch.
+* #153, #67: Warn on parse failure when reading known_hosts file. Thanks to
+ `@glasserc` for patch.
* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch
& patch.