diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-12-23 17:30:32 -0800 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-12-23 17:30:32 -0800 |
commit | cd6dff972823cc1ad2dd4f1f393d40bb66cfa4d6 (patch) | |
tree | 734b06a544485d673d727c82e2ce7c341c51bfea | |
parent | 102a861ec2e79ee78d8b8526fa410aac5db18753 (diff) | |
parent | a363f61ca839e817eb6853c5dc5af8c3b9b9226b (diff) | |
download | node-cd6dff972823cc1ad2dd4f1f393d40bb66cfa4d6.tar.gz |
Merge branch 'v0.10.35-release' into v0.10
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | src/node_version.h | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -525,3 +525,4 @@ pkcs <pkcs@gmx.com> Saúl Ibarra Corretgé <saghul@gmail.com> silverwind <silv3rwind@gmail.com> Steven R. Loomis <srl@icu-project.org> +James M Snell <jasnell@gmail.com> @@ -1,4 +1,13 @@ -2014.12.17, Version 0.10.34 (Stable) +2014.12.22, Version 0.10.35 (Stable) + +* tls: re-add 1024-bit SSL certs removed by f9456a2 (Chris Dickinson) + +* timers: don't close interval timers when unrefd (Julien Gilli) + +* timers: don't mutate unref list while iterating it (Julien Gilli) + + +2014.12.17, Version 0.10.34 (Stable), 52795f8fcc2de77cf997e671ea58614e5e425dfe * uv: update to v0.10.30 diff --git a/src/node_version.h b/src/node_version.h index 73ca13c1f..1ce82802f 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 10 #define NODE_PATCH_VERSION 35 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |