summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2015-07-09 14:19:36 -0700
committerJulien Gilli <julien.gilli@joyent.com>2015-07-09 14:19:36 -0700
commit0439a28d519fb6efe228074b0588a59452fc1677 (patch)
tree478df0db3354d2e9356b69f42ddbf2004dd6033b
parentc5d7b315289c993e9b823ce00c2d8ff21abe7507 (diff)
downloadnode-v0.10.40-release.tar.gz
2015.07.09, Version 0.10.40 (Maintenance)v0.10.40v0.10.40-release
* openssl: upgrade to 1.0.1p * V8: back-port JitCodeEvent patch from upstream (Ben Noordhuis) * win,msi: create npm folder in AppData directory (Steven Rockarts)
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog11
-rw-r--r--src/node_version.h2
3 files changed, 12 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index e82c4f474..3fc70766e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -534,3 +534,4 @@ Paulo McNally <paulomcnally@gmail.com>
AlexKVal <alexkval@gmail.com>
João Reis <reis@janeasystems.com>
Mathias Küsel <mathiask@hotmail.de>
+Steven Rockarts <srockarts@invidi.com>
diff --git a/ChangeLog b/ChangeLog
index 9d2be9618..83ea51050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2015.06.18, Version 0.10.39 (Maintenance)
+2015.07.09, Version 0.10.40 (Maintenance)
+
+* openssl: upgrade to 1.0.1p
+
+* V8: back-port JitCodeEvent patch from upstream (Ben Noordhuis)
+
+* win,msi: create npm folder in AppData directory (Steven Rockarts)
+
+
+2015.06.18, Version 0.10.39 (Maintenance), 615a35ccd2cb5cba80901862aefe51a940995f44
* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
diff --git a/src/node_version.h b/src/node_version.h
index e7d4d96d8..15545cf4e 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 40
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""