Merge branch 'v0.12.5-release' into v0.12

nodejs · Jun 22, 2015 · e359e01 · e359e01
2 parents f50c37d + 61c6abf
commit e359e01
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 ""