summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2013-05-20 14:43:14 -0700
committerisaacs <i@izs.me>2013-05-20 14:43:14 -0700
commit0fefcc1690f65593aba768b78e1b97b925f8caad (patch)
treed3ac88f3ebb9dabe66a4a7fc02d7b70bf54c75a2 /ChangeLog
parentd820b6441211ce79ed09ee3ef3992bc48e78bd93 (diff)
parent3a2b5030ae1cd200e92eaf3928bd20a8deda50c6 (diff)
downloadnode-new-0fefcc1690f65593aba768b78e1b97b925f8caad.tar.gz
Merge remote-tracking branch ry/v0.10 into master
Conflicts: AUTHORS ChangeLog src/node_crypto.cc src/node_version.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bbf2edeff2..baa9a0a9b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,19 @@
* zlib: allow passing options to convenience methods (Kyle Robinson Young)
+2013.05.17, Version 0.10.7 (Stable), d2fdae197ac542f686ee06835d1153dd43b862e5
+
+* uv: upgrade to v0.10.7
+
+* npm: Upgrade to 1.2.21
+
+* crypto: Don't ignore verify encoding argument (isaacs)
+
+* buffer, crypto: fix default encoding regression (Ben Noordhuis)
+
+* timers: fix setInterval() assert (Ben Noordhuis)
+
+
2013.05.14, Version 0.10.6 (Stable), 5deb1672f2b5794f8be19498a425ea4dc0b0711f
* module: Deprecate require.extensions (isaacs)