Merge branch 'v0.10.21-release' into v0.10

nodejs · Oct 18, 2013 · 7940833 · 7940833
2 parents 5e41c02 + e2da042
commit 7940833
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,19 @@
-2013.09.30, Version 0.10.20 (Stable)
+2013.10.18, Version 0.10.21 (Stable)
+
+* uv: Upgrade to v0.10.18
+
+* crypto: clear errors from verify failure (Timothy J Fontaine)
+
+* dtrace: interpret two byte strings (Dave Pacheco)
+
+* fs: fix fs.truncate() file content zeroing bug (Ben Noordhuis)
+
+* http: provide backpressure for pipeline flood (isaacs)
+
+* tls: fix premature connection termination (Ben Noordhuis)
+
+
+2013.09.30, Version 0.10.20 (Stable), d7234c8d50a1af73f60d2d3c0cc7eed17429a481
 
 * tls: fix sporadic hang and partial reads (Fedor Indutny)
   - fixes "npm ERR! cb() never called!"

diff --git a/src/node_version.h b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 21
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""