summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2015-06-18 22:57:52 -0700
committerJulien Gilli <julien.gilli@joyent.com>2015-06-18 22:57:52 -0700
commit615a35ccd2cb5cba80901862aefe51a940995f44 (patch)
tree3a39154f63de9a16557f860b428f1666ce2444c2
parentdcb7ef2e4024bbb984c5d40b692fb5ec6aefa008 (diff)
downloadnode-new-v0.10.39-release.tar.gz
2015.06.18, Version 0.10.39 (Maintenance)v0.10.39v0.10.39-release
* openssl: upgrade to 1.0.1o (Addressing multiple CVEs) * install: fix source path for openssl headers (Oguz Bastemur) * install: make sure opensslconf.h is overwritten (Oguz Bastemur) * timers: fix timeout when added in timer's callback (Julien Gilli) * windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
-rw-r--r--AUTHORS4
-rw-r--r--ChangeLog15
-rw-r--r--src/node_version.h2
3 files changed, 19 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index aab71df334..e82c4f4742 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -530,3 +530,7 @@ Amir Saboury <amir.saboury@gmail.com>
Florin-Cristian Gavrila <cristi_gavrila1@yahoo.com>
Tyler Anton <mtyleranton@gmail.com>
Jonas Dohse <jonas@dohse.ch>
+Paulo McNally <paulomcnally@gmail.com>
+AlexKVal <alexkval@gmail.com>
+João Reis <reis@janeasystems.com>
+Mathias Küsel <mathiask@hotmail.de>
diff --git a/ChangeLog b/ChangeLog
index 69502ebf2e..9d2be9618f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2015.03.23, Version 0.10.38 (Maintenance)
+2015.06.18, Version 0.10.39 (Maintenance)
+
+* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
+
+* install: fix source path for openssl headers (Oguz Bastemur)
+
+* install: make sure opensslconf.h is overwritten (Oguz Bastemur)
+
+* timers: fix timeout when added in timer's callback (Julien Gilli)
+
+* windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
+
+
+2015.03.23, Version 0.10.38 (Maintenance), 0b5731a63cc40c4fe9275c79158fe0a5dd4d1609
* openssl: upgrade to 1.0.1m (Addressing multiple CVEs)
diff --git a/src/node_version.h b/src/node_version.h
index 094c81c371..259ed84a1d 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 39
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""