Merge branch 'v0.10.34-release' into v0.10

nodejs · Dec 17, 2014 · a6757fb · a6757fb
2 parents afb488d + 52795f8
commit a6757fb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -515,6 +515,13 @@ Kevin Simper <[email protected]>
 Jackson Tian <[email protected]>
 Tristan Berger <[email protected]>
 Mathias Schreck <[email protected]>
-Calvin Metcalf <[email protected]>
 Matthew Fitzsimmons <[email protected]>
 Swaagie <[email protected]>
+Emmanuel Odeke <[email protected]>
+Eric Mill <[email protected]>
+Brendan Ashworth <[email protected]>
+Alejandro Oviedo <[email protected]>
+pkcs <[email protected]>
+Saúl Ibarra Corretgé <[email protected]>
+silverwind <[email protected]>
+Steven R. Loomis <[email protected]>
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,27 @@
-2014.10.20, Version 0.10.33 (Stable)
+2014.12.17, Version 0.10.34 (Stable)
+
+* uv: update to v0.10.30
+
+* zlib: upgrade to v1.2.8
+
+* child_process: check execFile args is an array (Sam Roberts)
+
+* child_process: check fork args is an array (Sam Roberts)
+
+* crypto: update root certificates (Ben Noordhuis)
+
+* domains: fix issues with abort on uncaught (Julien Gilli)
+
+* timers: Avoid linear scan in _unrefActive. (Julien Gilli)
+
+* timers: fix unref() memory leak (Trevor Norris)
+
+* v8: add api for aborting on uncaught exception (Julien Gilli)
+
+* debugger: fix when using "use strict" (Julien Gilli)
+
+
+2014.10.20, Version 0.10.33 (Stable), 8d045a30e95602b443eb259a5021d33feb4df079
 
 * openssl: Update to 1.0.1j (Addressing multiple CVEs)
 
@@ -71,7 +94,7 @@
 
 * deps: backport 4ed5fde4f from v8 upstream (Fedor Indutny)
 
-* deps: cherry-pick eca441b2 from OpenSSL (Fedor Indutny)
+* 
 
 * lib: remove and restructure calls to isNaN() (cjihrig)
 

diff --git a/src/node_version.h b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 34
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""