summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-12-19 14:55:20 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-12-19 14:55:20 -0800
commit1d1ef77bb2a78380b1ea08e22f89932a98eb25ed (patch)
treed3b196283e0cb9f990f4ad90e7672fc1d1164ead
parent5601bf0928e2e738917320d83f8302703a62091b (diff)
parentccdfd02c047d5588b6bebdc501a766271a009493 (diff)
downloadparamiko-1d1ef77bb2a78380b1ea08e22f89932a98eb25ed.tar.gz
Merge branch '1.14' into 1.15
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index e5adbd22..f5348e5b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :release:`1.14.2 <2014-12-19>`
+* :release:`1.13.3 <2014-12-19>`
* :bug:`413` (also :issue:`414`, :issue:`420`, :issue:`454`) Be significantly
smarter about polling & timing behavior when running proxy commands, to avoid
unnecessary (often 100%!) CPU usage. Major thanks to Jason Dunsmore for