diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-03-11 21:12:00 -0700 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-03-11 21:12:00 -0700 |
| commit | 50c23fb381c25c72538c2dce549bd26cdd03098a (patch) | |
| tree | 2e42c30dc8b851a627fd4e07b5d2ed2e87701345 | |
| parent | 219c80d0996304ebb98383eb7eeead2135e37f15 (diff) | |
| parent | 7d6b5b1d5ba726331f9ccaaae59af7cd53eee82e (diff) | |
| download | node-50c23fb381c25c72538c2dce549bd26cdd03098a.tar.gz | |
Merge branch 'v0.10.37-release' into v0.10
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
3 files changed, 21 insertions, 2 deletions
@@ -526,3 +526,7 @@ Saúl Ibarra Corretgé <saghul@gmail.com> silverwind <silv3rwind@gmail.com> Steven R. Loomis <srl@icu-project.org> James M Snell <jasnell@gmail.com> +Amir Saboury <amir.saboury@gmail.com> +Florin-Cristian Gavrila <cristi_gavrila1@yahoo.com> +Tyler Anton <mtyleranton@gmail.com> +Jonas Dohse <jonas@dohse.ch> @@ -1,4 +1,19 @@ -2015.01.26, Version 0.10.36 (Stable) +2015.03.11, Version 0.10.37 (Maintenance) + +* uv: update to 0.10.36 (CVE-2015-0278) + +* domains: fix stack clearing after error handled (Jonas Dohse) + +* buffer: reword Buffer.concat error message (Chris Dickinson) + +* console: allow Object.prototype fields as labels (Julien Gilli) + +* V8: log version in profiler log file (Ben Noordhuis) + +* http: fix performance regression for GET requests (Florin-Cristian Gavrila) + + +2015.01.26, Version 0.10.36 (Stable), 09b482886bdd3d863c3d4e7d71264eac0daaf9e1 * openssl: update to 1.0.1l diff --git a/src/node_version.h b/src/node_version.h index 6baad291a..684d7ec5d 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 10 #define NODE_PATCH_VERSION 37 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |