diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-03-31 16:22:18 -0700 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-03-31 16:22:18 -0700 |
| commit | cac2a740a91adc66ec24c98648c594fa3d072bf2 (patch) | |
| tree | 5f7c9a7662c833b6716f4674bbc21c0c7019453a | |
| parent | f3f4e282168d243610f8e0241d633ff941c9c260 (diff) | |
| parent | 523d445705027438b83b8d5958c9beeb1c8711d9 (diff) | |
| download | node-new-cac2a740a91adc66ec24c98648c594fa3d072bf2.tar.gz | |
Merge branch 'v0.12.2-release' into v0.12
| -rw-r--r-- | AUTHORS | 5 | ||||
| -rw-r--r-- | ChangeLog | 49 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
3 files changed, 54 insertions, 2 deletions
@@ -199,6 +199,7 @@ Fedor Indutny Felix Böhm Felix Geisendörfer Feross Aboukhadijeh +Florin-Cristian Gavrila Forrest L Norvell Francois Marier Fred K. Schott @@ -216,6 +217,7 @@ George Miroshnykov George Shank George Stagas Gil Pedersen +Gireesh Punathil Girish Ramakrishnan Glen Low Glen Mailer @@ -304,6 +306,7 @@ Johannes Wüller John Albietz Johnny Ray Jon Crosby +Jonas Dohse Jonas Pfenniger Jonas Westerlund Jonathan Johnson @@ -452,6 +455,7 @@ Niklas Fiekas Nirk Niggler Nuno Job Oguz Bastemur +Ole André Vadla Ravnås Oleg Efimov Oleg Slobodskoi Olivier Lalonde @@ -613,6 +617,7 @@ Trevor Livingston Trevor Norris Tristan Berger Tuğrul Topuz +Tyler Anton Tyler Larson Tyler Neylon Urban Hafner @@ -1,4 +1,51 @@ -2015.03.23, Version 0.12.1 (Stable) +2015.03.31, Version 0.12.2 (Stable) + +* uv: Upgrade to 1.4.2 + +* npm: Upgrade to 2.7.4 + +* V8: do not add extra newline in log file (Julien Gilli) + +* V8: Fix --max_old_space_size=4096 integer overflow (Andrei Sedoi) + +* asyncwrap: fix constructor condition for early ret (Trevor Norris) + +* buffer: align chunks on 8-byte boundary (Fedor Indutny) + +* buffer: fix pool offset adjustment (Trevor Norris) + +* build: fix use of strict aliasing (Trevor Norris) + +* console: allow Object.prototype fields as labels (Colin Ihrig) + +* fs: make F_OK/R_OK/W_OK/X_OK not writable (Jackson Tian) + +* fs: properly handle fd passed to truncate() (Bruno Jouhier) + +* http: fix assert on data/end after socket error (Fedor Indutny) + +* lib: fix max size check in Buffer constructor (Ben Noordhuis) + +* lib: fix stdio/ipc sync i/o regression (Ben Noordhuis) + +* module: replace NativeModule.require (Herbert Vojčík) + +* net: allow port 0 in connect() (cjihrig) + +* net: unref timer in parent sockets (Fedor Indutny) + +* path: refactor for performance and consistency (Nathan Woltman) + +* smalloc: extend user API (Trevor Norris) + +* src: fix for SIGINT crash on FreeBSD (Fedor Indutny) + +* src: fix builtin modules failing with --use-strict (Julien Gilli) + +* watchdog: fix timeout for early polling return (Saúl Ibarra Corretgé) + + +2015.03.23, Version 0.12.1 (Stable), 0034086b49f22cfde765a7e9f55db25f8eb310b6 * openssl: upgrade to 1.0.1m (Addressing multiple CVES) diff --git a/src/node_version.h b/src/node_version.h index 1c26c959f9..2082cb9510 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 12 #define NODE_PATCH_VERSION 2 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |