summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2015-01-26 10:28:23 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2015-01-26 10:28:23 -0800
commit09b482886bdd3d863c3d4e7d71264eac0daaf9e1 (patch)
tree6918949c4b9d16a5352882b5fc6145578a3dfcb4
parent6168fe6720650052728f3e78a495b723f0b41ce3 (diff)
downloadnode-09b482886bdd3d863c3d4e7d71264eac0daaf9e1.tar.gz
2015.01.26, Version 0.10.36 (Stable)v0.10.36v0.10.36-release
* openssl: update to 1.0.1l * v8: Fix debugger and strict mode regression (Julien Gilli) * v8: don't busy loop in cpu profiler thread (Ben Noordhuis)
-rw-r--r--ChangeLog11
-rw-r--r--src/node_version.h2
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index faad34f05..9d5cae1b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2014.12.22, Version 0.10.35 (Stable)
+2015.01.26, Version 0.10.36 (Stable)
+
+* openssl: update to 1.0.1l
+
+* v8: Fix debugger and strict mode regression (Julien Gilli)
+
+* v8: don't busy loop in cpu profiler thread (Ben Noordhuis)
+
+
+2014.12.22, Version 0.10.35 (Stable), a363f61ca839e817eb6853c5dc5af8c3b9b9226b
* tls: re-add 1024-bit SSL certs removed by f9456a2 (Chris Dickinson)
diff --git a/src/node_version.h b/src/node_version.h
index b78d2b218..5605ae097 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 36
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""