summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-12-17 14:39:24 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-12-17 14:39:24 -0800
commita6757fb9d09ad10304378309cfb45659bb5c53f1 (patch)
tree8895e00cb63e14d77a1b66dca68f5503e81ee396
parentafb488db868742408935fc8f05e859985bc1dac0 (diff)
parent52795f8fcc2de77cf997e671ea58614e5e425dfe (diff)
downloadnode-a6757fb9d09ad10304378309cfb45659bb5c53f1.tar.gz
Merge branch 'v0.10.34-release' into v0.10
-rw-r--r--AUTHORS9
-rw-r--r--ChangeLog27
-rw-r--r--src/node_version.h2
3 files changed, 34 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index b51cd7160..71ca59bfe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -515,6 +515,13 @@ Kevin Simper <kevin.simper@gmail.com>
Jackson Tian <shyvo1987@gmail.com>
Tristan Berger <tristan.berger@gmail.com>
Mathias Schreck <schreck.mathias@googlemail.com>
-Calvin Metcalf <cmetcalf@appgeo.com>
Matthew Fitzsimmons <matt@fitzage.com>
Swaagie <info@martijnswaagman.nl>
+Emmanuel Odeke <emmanuel.odeke@cmgcanada.ca>
+Eric Mill <eric@konklone.com>
+Brendan Ashworth <squirrelslikeacorns@gmail.com>
+Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
+pkcs <pkcs@gmx.com>
+Saúl Ibarra Corretgé <saghul@gmail.com>
+silverwind <silv3rwind@gmail.com>
+Steven R. Loomis <srl@icu-project.org>
diff --git a/ChangeLog b/ChangeLog
index 185b0d30e..b0fb3a0df 100644
--- 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
index b349414f7..0faffd184 100644
--- 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 ""