summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2015-06-22 11:22:53 -0700
committerJulien Gilli <julien.gilli@joyent.com>2015-06-22 11:22:53 -0700
commit61c6abf00898fe00eb7fcf2c23ba0b01cf12034c (patch)
treee9b61e923258b340d2a4451d5af6400dcbff0595
parentf50c37d99316f2f7dc1618ea2eef4a0201a5ae0e (diff)
downloadnodejs-0.12.5.tar.gz
nodejs-0.12.5.tar.bz2
nodejs-0.12.5.zip
2015.06.22, Version 0.12.5 (Stable)v0.12.5
* openssl: upgrade to 1.0.1o (Addressing multiple CVEs) * npm: upgrade to 2.11.2 * uv: upgrade to 1.6.1 * V8: avoid deadlock when profiling is active (Dmitri Melikyan) * 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--AUTHORS3
-rw-r--r--ChangeLog21
-rw-r--r--src/node_version.h2
3 files changed, 24 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index d6e6dfc81..6721b2987 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ Aku Kotkavuo
Alejandro Oviedo
Alex Kocharin
Alex Xu
+AlexKVal
Alexander Uvarov
Alexandr Emelin
Alexandre Marangone
@@ -391,6 +392,7 @@ Mark Stosberg
Marshall Culpepper
Mathias Buus
Mathias Bynens
+Mathias Küsel
Mathias Pettersson
Mathias Schreck
Matt Brubeck
@@ -476,6 +478,7 @@ Paul Querna
Paul Serby
Paul Vorbach
Paulo Matias
+Paulo McNally
Pavel Lang
Pedro Ballesteros
Pedro Teixeira
diff --git a/ChangeLog b/ChangeLog
index d9e4f521d..27f5240f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
-2015.05.22, Version 0.12.4 (Stable)
+2015.06.22, Version 0.12.5 (Stable)
+
+* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
+
+* npm: upgrade to 2.11.2
+
+* uv: upgrade to 1.6.1
+
+* V8: avoid deadlock when profiling is active (Dmitri Melikyan)
+
+* 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.05.22, Version 0.12.4 (Stable), 0a604e92e258c5ee2752d763e50721e35053f135
* npm: upgrade to 2.10.1
diff --git a/src/node_version.h b/src/node_version.h
index 522000501..3129e1e91 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 12
#define NODE_PATCH_VERSION 5
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""