summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2013-03-28 13:05:37 -0700
committerisaacs <i@izs.me>2013-03-28 13:05:37 -0700
commit8106dc362488b6a73c2d2d5043af554b5ab1e6da (patch)
tree5df3e829bb4bc55330506464ccf5eee7652c4ba8
parent902d6cb6d768d92c53e21e6a214f65c08167126c (diff)
parent1e0de9c426e07a260bbec2d2196c2d2db8eb8886 (diff)
downloadnode-8106dc362488b6a73c2d2d5043af554b5ab1e6da.tar.gz
Merge branch 'v0.10.2-release' into v0.10
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog37
-rw-r--r--src/node_version.h2
3 files changed, 39 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 9b392cf39..c9c689fa2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -429,3 +429,5 @@ Henry Chin <hheennrryy@gmail.com>
Julian Gruber <julian@juliangruber.com>
JeongHoon Byun <outsideris@gmail.com>
Iskren Ivov Chernev <iskren.chernev@gmail.com>
+Alexey Kupershtokh <alexey.kupershtokh@gmail.com>
+Benjamin Ruston <benjy.ruston@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index a6263414e..bf08851ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,39 @@
-2013.03.21, Version 0.10.1 (Stable)
+2013.03.28, Version 0.10.2 (Stable)
+
+* npm: Upgrade to 1.2.15
+
+* uv: Upgrade to 0.10.3
+
+* tls: handle SSL_ERROR_ZERO_RETURN (Fedor Indutny)
+
+* tls: handle errors before calling C++ methods (Fedor Indutny)
+
+* tls: remove harmful unnecessary bounds checking (Marcel Laverdet)
+
+* crypto: make getCiphers() return non-SSL ciphers (Ben Noordhuis)
+
+* crypto: check randomBytes() size argument (Ben Noordhuis)
+
+* timers: do not calculate Timeout._when property (Alexey Kupershtokh)
+
+* timers: fix off-by-one ms error (Alexey Kupershtokh)
+
+* timers: handle signed int32 overflow in enroll() (Fedor Indutny)
+
+* stream: Fix stall in Transform under very specific conditions (Gil Pedersen)
+
+* stream: Handle late 'readable' event listeners (isaacs)
+
+* stream: Fix early end in Writables on zero-length writes (isaacs)
+
+* domain: fix domain callback from MakeCallback (Trevor Norris)
+
+* child_process: don't emit same handle twice (Ben Noordhuis)
+
+* child_process: fix sending utf-8 to child process (Ben Noordhuis)
+
+
+2013.03.21, Version 0.10.1 (Stable), c274d1643589bf104122674a8c3fd147527a667d
* npm: upgrade to 1.2.15
diff --git a/src/node_version.h b/src/node_version.h
index 9a9b6b507..c3abcd122 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -30,7 +30,7 @@
# define NODE_TAG ""
#endif
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)