diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-09-30 15:06:02 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-09-30 15:06:02 -0700 |
| commit | 451497c81ebfb38dc04343248b3e2d4bb9bdf26a (patch) | |
| tree | 0f23cd8b817a78c8c86e8c88a173805551570d40 | |
| parent | 994ce4c99fb1e284bcfdc2500ae62e0138bf140e (diff) | |
| parent | d7234c8d50a1af73f60d2d3c0cc7eed17429a481 (diff) | |
| download | node-451497c81ebfb38dc04343248b3e2d4bb9bdf26a.tar.gz | |
Merge branch 'v0.10.20-release' into v0.10
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
2 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,10 @@ -2013.09.24, Version 0.10.19 (Stable) +2013.09.30, Version 0.10.20 (Stable) + +* tls: fix sporadic hang and partial reads (Fedor Indutny) + - fixes "npm ERR! cb() never called!" + + +2013.09.24, Version 0.10.19 (Stable), 6b5e6a5a3ec8d994c9aab3b800b9edbf1b287904 * uv: Upgrade to v0.10.17 diff --git a/src/node_version.h b/src/node_version.h index f02dbe3c2..f30216795 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 10 #define NODE_PATCH_VERSION 20 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |